Merge branch 'ci-test-fix' into 'develop'

SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579
This commit is contained in:
lambda 2018-12-20 16:31:08 +00:00
commit 61a88a6757
1 changed files with 2 additions and 2 deletions

View File

@ -1,8 +1,6 @@
defmodule Pleroma.Plugs.SetUserSessionIdPlugTest do defmodule Pleroma.Plugs.SetUserSessionIdPlugTest do
use Pleroma.Web.ConnCase, async: true use Pleroma.Web.ConnCase, async: true
Code.ensure_compiled(Pleroma.User)
alias Pleroma.Plugs.SetUserSessionIdPlug alias Pleroma.Plugs.SetUserSessionIdPlug
alias Pleroma.User alias Pleroma.User
@ -30,6 +28,8 @@ test "doesn't do anything if the user isn't set", %{conn: conn} do
end end
test "sets the user_id in the session to the user id of the user assign", %{conn: conn} do 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 =
conn conn
|> assign(:user, %User{id: 1}) |> assign(:user, %User{id: 1})