logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 3f64ba5fc8f29efeadf7a072cf8339c778b3fd2d
parent f55ffc78938a932da9940c34a83bd56e3386f983
Author: kaniini <nenolod@gmail.com>
Date:   Sun,  9 Sep 2018 13:06:17 +0000

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

test: user enabled plug tests: fix circular reference

See merge request pleroma/pleroma!336

Diffstat:

Mtest/plugs/user_enabled_plug_test.exs10+++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git 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