diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
| commit | cbdd11c38111fd7c195983f40265b675e1201d4e (patch) | |
| tree | 44c63ed6430a743cfe589fed5213467a0dd6dabb /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 355f285a8693934fbc8205c2c9ecde0a758fc158 (diff) | |
| parent | 34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff) | |
| download | pleroma-cbdd11c38111fd7c195983f40265b675e1201d4e.tar.gz | |
Merge develop to bump elixir version in the CI so I don't get failing formatting
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 1b8b4d4b7..e50f0edde 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -334,7 +334,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do describe "GET /api/pleroma/admin/users" do test "renders users array for the first page" do admin = insert(:user, info: %{is_admin: true}) - user = insert(:user) + user = insert(:user, local: false, tags: ["foo", "bar"]) conn = build_conn() @@ -348,12 +348,18 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => admin.info.deactivated, "id" => admin.id, - "nickname" => admin.nickname + "nickname" => admin.nickname, + "roles" => %{"admin" => true, "moderator" => false}, + "local" => true, + "tags" => [] }, %{ "deactivated" => user.info.deactivated, "id" => user.id, - "nickname" => user.nickname + "nickname" => user.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => false, + "tags" => ["foo", "bar"] } ] } @@ -391,7 +397,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => user.info.deactivated, "id" => user.id, - "nickname" => user.nickname + "nickname" => user.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => true, + "tags" => [] } ] } @@ -414,7 +423,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => user.info.deactivated, "id" => user.id, - "nickname" => user.nickname + "nickname" => user.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => true, + "tags" => [] } ] } @@ -431,7 +443,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => user2.info.deactivated, "id" => user2.id, - "nickname" => user2.nickname + "nickname" => user2.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => true, + "tags" => [] } ] } @@ -455,7 +470,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => user.info.deactivated, "id" => user.id, - "nickname" => user.nickname + "nickname" => user.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => true, + "tags" => [] } ] } @@ -479,12 +497,18 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => admin.info.deactivated, "id" => admin.id, - "nickname" => admin.nickname + "nickname" => admin.nickname, + "roles" => %{"admin" => true, "moderator" => false}, + "local" => true, + "tags" => [] }, %{ "deactivated" => user.info.deactivated, "id" => user.id, - "nickname" => user.nickname + "nickname" => user.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => true, + "tags" => [] } ] } @@ -504,7 +528,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{ "deactivated" => !user.info.deactivated, "id" => user.id, - "nickname" => user.nickname + "nickname" => user.nickname, + "roles" => %{"admin" => false, "moderator" => false}, + "local" => true, + "tags" => [] } end end |