logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 61a88a6757bc557a370888d288f93681cff9668b
parent: 2e2030ada8b9aa00936057d47260cd03d01d92be
Author: lambda <pleromagit@rogerbraun.net>
Date:   Thu, 20 Dec 2018 16:31:08 +0000

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

SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579

Diffstat:

Mtest/plugs/set_user_session_id_plug_test.exs4++--
1 file 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 @@ -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})