diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
| commit | 20e0f3660541f19cf878b789aa9f5b9d5ce8cddb (patch) | |
| tree | 08cb90d62e431beb7ee6a2261dc679b725aec1f1 /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 2a95014b9d7142aa2549e70f428293af78fae8eb (diff) | |
| parent | 15aa94f40f73444d67da7cb71ec219b97ec5142e (diff) | |
| download | pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.tar.gz pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index e50f0edde..0aab7f262 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -495,20 +495,20 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do "page_size" => 50, "users" => [ %{ - "deactivated" => admin.info.deactivated, - "id" => admin.id, - "nickname" => admin.nickname, - "roles" => %{"admin" => true, "moderator" => false}, - "local" => true, - "tags" => [] - }, - %{ "deactivated" => user.info.deactivated, "id" => user.id, "nickname" => user.nickname, "roles" => %{"admin" => false, "moderator" => false}, "local" => true, "tags" => [] + }, + %{ + "deactivated" => admin.info.deactivated, + "id" => admin.id, + "nickname" => admin.nickname, + "roles" => %{"admin" => true, "moderator" => false}, + "local" => true, + "tags" => [] } ] } |