aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-20 16:31:08 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-20 16:31:08 +0000
commit61a88a6757bc557a370888d288f93681cff9668b (patch)
tree4d1ca5b62d60d41ccab68fb2fb8c7519d62a48be
parent2e2030ada8b9aa00936057d47260cd03d01d92be (diff)
parentadbb265fc6559c0f93c369b6adde94e9eb92f3c9 (diff)
downloadpleroma-61a88a6757bc557a370888d288f93681cff9668b.tar.gz
Merge branch 'ci-test-fix' into 'develop'
SetUserSessionIdPlugTest: try again to fix random ci failures See merge request pleroma/pleroma!579
-rw-r--r--test/plugs/set_user_session_id_plug_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/plugs/set_user_session_id_plug_test.exs b/test/plugs/set_user_session_id_plug_test.exs
index a5fdd4146..7cf8e42cc 100644
--- a/test/plugs/set_user_session_id_plug_test.exs
+++ b/test/plugs/set_user_session_id_plug_test.exs
@@ -1,8 +1,6 @@
defmodule Pleroma.Plugs.SetUserSessionIdPlugTest do
use Pleroma.Web.ConnCase, async: true
- Code.ensure_compiled(Pleroma.User)
-
alias Pleroma.Plugs.SetUserSessionIdPlug
alias Pleroma.User
@@ -30,6 +28,8 @@ defmodule Pleroma.Plugs.SetUserSessionIdPlugTest do
end
test "sets the user_id in the session to the user id of the user assign", %{conn: conn} do
+ Code.ensure_compiled(Pleroma.User)
+
conn =
conn
|> assign(:user, %User{id: 1})