diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-24 09:23:59 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-24 09:23:59 +0300 |
| commit | 99cf1ef9be93ebab04d088848804369e6295a76d (patch) | |
| tree | 94738e2bc0ee642db4abc4e65a9798782de59623 /test/plugs | |
| parent | d3fb9e02cc0ce7dc462e587e639e117aaef5fbc5 (diff) | |
| parent | 17c237ba808d4356bb1e202e459680563b79ef99 (diff) | |
| download | pleroma-99cf1ef9be93ebab04d088848804369e6295a76d.tar.gz pleroma-99cf1ef9be93ebab04d088848804369e6295a76d.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/plugs')
| -rw-r--r-- | test/plugs/admin_secret_authentication_plug_test.exs | 2 | ||||
| -rw-r--r-- | test/plugs/user_enabled_plug_test.exs | 2 | ||||
| -rw-r--r-- | test/plugs/user_is_admin_plug_test.exs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/plugs/admin_secret_authentication_plug_test.exs b/test/plugs/admin_secret_authentication_plug_test.exs index e1d4b391f..c94a62c10 100644 --- a/test/plugs/admin_secret_authentication_plug_test.exs +++ b/test/plugs/admin_secret_authentication_plug_test.exs @@ -37,6 +37,6 @@ defmodule Pleroma.Plugs.AdminSecretAuthenticationPlugTest do %{conn | params: %{"admin_token" => "password123"}} |> AdminSecretAuthenticationPlug.call(%{}) - assert conn.assigns[:user].info.is_admin + assert conn.assigns[:user].is_admin end end diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index c0fafcab1..996a7d77b 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -17,7 +17,7 @@ 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}) + user = insert(:user, deactivated: true) conn = conn diff --git a/test/plugs/user_is_admin_plug_test.exs b/test/plugs/user_is_admin_plug_test.exs index 9e05fff18..136dcc54e 100644 --- a/test/plugs/user_is_admin_plug_test.exs +++ b/test/plugs/user_is_admin_plug_test.exs @@ -9,7 +9,7 @@ defmodule Pleroma.Plugs.UserIsAdminPlugTest do import Pleroma.Factory test "accepts a user that is admin" do - user = insert(:user, info: %{is_admin: true}) + user = insert(:user, is_admin: true) conn = build_conn() |
