From 33a5294fad86134f247d89c18e588fd5155a512a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 9 Sep 2018 12:22:00 +0000 Subject: [PATCH 1/3] test: user enabled plug tests: fix circular reference --- test/plugs/user_enabled_plug_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index af877db76..225368efc 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -1,8 +1,8 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do use Pleroma.Web.ConnCase, async: true - alias Pleroma.Plugs.UserEnabledPlug alias Pleroma.User + alias Pleroma.Plugs.UserEnabledPlug test "doesn't do anything if the user isn't set", %{conn: conn} do ret_conn = From fc92bb28b487913aded338aae4f1b2123f138eb0 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 9 Sep 2018 12:43:58 +0000 Subject: [PATCH 2/3] tests: try breaking the cycle a different way --- test/plugs/user_enabled_plug_test.exs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index 225368efc..3b9451c89 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -1,7 +1,6 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do use Pleroma.Web.ConnCase, async: true - alias Pleroma.User alias Pleroma.Plugs.UserEnabledPlug test "doesn't do anything if the user isn't set", %{conn: conn} do @@ -15,7 +14,7 @@ test "doesn't do anything if the user isn't set", %{conn: conn} do test "with a user that is deactivated, it removes that user", %{conn: conn} do conn = conn - |> assign(:user, %User{info: %{"deactivated" => true}}) + |> assign(:user, %Pleroma.User{info: %{"deactivated" => true}}) |> UserEnabledPlug.call(%{}) assert conn.assigns.user == nil @@ -24,7 +23,7 @@ test "with a user that is deactivated, it removes that user", %{conn: conn} do test "with a user that is not deactivated, it does nothing", %{conn: conn} do conn = conn - |> assign(:user, %User{}) + |> assign(:user, %Pleroma.User{}) ret_conn = conn From a4fe14de026b38915a08c867fa9557c8d453e791 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 9 Sep 2018 12:56:25 +0000 Subject: [PATCH 3/3] tests: break the cycle using pleroma.factory --- test/plugs/user_enabled_plug_test.exs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index 3b9451c89..ee4f72ccf 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -2,6 +2,7 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do use Pleroma.Web.ConnCase, async: true alias Pleroma.Plugs.UserEnabledPlug + import Pleroma.Factory test "doesn't do anything if the user isn't set", %{conn: conn} do ret_conn = @@ -12,18 +13,22 @@ test "doesn't do anything if the user isn't set", %{conn: conn} 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, %Pleroma.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, %Pleroma.User{}) + |> assign(:user, user) ret_conn = conn