diff options
author | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
commit | 791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a (patch) | |
tree | 98ebe750f99cb6be2532e9dbaf3b334957353777 /test/plugs | |
parent | 8eff05d4c62c4d3300fee173cad84f75a0aafb4d (diff) | |
parent | 060adfd762a5183b3cc5f51e041819b24b8430d2 (diff) | |
download | pleroma-791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a.tar.gz pleroma-791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a.zip |
Merge branch 'develop' into feature/store-statuses-data-inside-flag
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() |