aboutsummaryrefslogtreecommitdiff
path: root/test/web/admin_api/admin_api_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-03-25 13:37:32 +0100
committerlain <lain@soykaf.club>2019-03-25 13:37:32 +0100
commit037fefe21871ee0a1926286c87c334ea1d339394 (patch)
tree2775b91de5652ddd5baa3e32861ac9cac4bc40be /test/web/admin_api/admin_api_controller_test.exs
parentf6fab01ba7a08fe0e5147f82d9e3dd294922dc93 (diff)
parentb028b0f97d4b6310b1402b3b876aa8f8b286bc4d (diff)
downloadpleroma-037fefe21871ee0a1926286c87c334ea1d339394.tar.gz
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
-rw-r--r--test/web/admin_api/admin_api_controller_test.exs16
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" => []
}
]
}