diff options
author | kaniini <nenolod@gmail.com> | 2018-09-09 13:06:17 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-09-09 13:06:17 +0000 |
commit | 3f64ba5fc8f29efeadf7a072cf8339c778b3fd2d (patch) | |
tree | c75c5063aa86342d80100d330bdba8f4a3f21677 | |
parent | f55ffc78938a932da9940c34a83bd56e3386f983 (diff) | |
parent | a4fe14de026b38915a08c867fa9557c8d453e791 (diff) | |
download | pleroma-3f64ba5fc8f29efeadf7a072cf8339c778b3fd2d.tar.gz |
Merge branch 'bugfix/test-circular-reference' into 'develop'
test: user enabled plug tests: fix circular reference
See merge request pleroma/pleroma!336
-rw-r--r-- | test/plugs/user_enabled_plug_test.exs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index af877db76..ee4f72ccf 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -2,7 +2,7 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do use Pleroma.Web.ConnCase, async: true alias Pleroma.Plugs.UserEnabledPlug - alias Pleroma.User + import Pleroma.Factory test "doesn't do anything if the user isn't set", %{conn: conn} do ret_conn = @@ -13,18 +13,22 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do end test "with a user that is deactivated, it removes that user", %{conn: conn} do + user = insert(:user, info: %{"deactivated" => true}) + conn = conn - |> assign(:user, %User{info: %{"deactivated" => true}}) + |> assign(:user, user) |> UserEnabledPlug.call(%{}) assert conn.assigns.user == nil end test "with a user that is not deactivated, it does nothing", %{conn: conn} do + user = insert(:user) + conn = conn - |> assign(:user, %User{}) + |> assign(:user, user) ret_conn = conn |