Merge branch 'bugfix/test-circular-reference' into 'develop'

test: user enabled plug tests: fix circular reference

See merge request pleroma/pleroma!336
This commit is contained in:
kaniini 2018-09-09 13:06:17 +00:00
commit 3f64ba5fc8
1 changed files with 7 additions and 3 deletions

View File

@ -2,7 +2,7 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do
use Pleroma.Web.ConnCase, async: true use Pleroma.Web.ConnCase, async: true
alias Pleroma.Plugs.UserEnabledPlug alias Pleroma.Plugs.UserEnabledPlug
alias Pleroma.User import Pleroma.Factory
test "doesn't do anything if the user isn't set", %{conn: conn} do test "doesn't do anything if the user isn't set", %{conn: conn} do
ret_conn = ret_conn =
@ -13,18 +13,22 @@ test "doesn't do anything if the user isn't set", %{conn: conn} do
end end
test "with a user that is deactivated, it removes that user", %{conn: conn} do test "with a user that is deactivated, it removes that user", %{conn: conn} do
user = insert(:user, info: %{"deactivated" => true})
conn = conn =
conn conn
|> assign(:user, %User{info: %{"deactivated" => true}}) |> assign(:user, user)
|> UserEnabledPlug.call(%{}) |> UserEnabledPlug.call(%{})
assert conn.assigns.user == nil assert conn.assigns.user == nil
end end
test "with a user that is not deactivated, it does nothing", %{conn: conn} do test "with a user that is not deactivated, it does nothing", %{conn: conn} do
user = insert(:user)
conn = conn =
conn conn
|> assign(:user, %User{}) |> assign(:user, user)
ret_conn = ret_conn =
conn conn