X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fadmin_api%2Fadmin_api_controller_test.exs;h=0aab7f26257490fd612317491323587458c77a26;hb=b548181b52c4397d5034cfd95b2ef7e05c9c9c22;hp=c72e6b9755f3fc1a05499ac53dd1cde856a63278;hpb=490d9cf7b149bbb93f6065fc807eafd339bcc0ea;p=akkoma

diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index c72e6b975..0aab7f262 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()
@@ -349,13 +349,17 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                    "deactivated" => admin.info.deactivated,
                    "id" => admin.id,
                    "nickname" => admin.nickname,
-                   "roles" => %{"admin" => true, "moderator" => false}
+                   "roles" => %{"admin" => true, "moderator" => false},
+                   "local" => true,
+                   "tags" => []
                  },
                  %{
                    "deactivated" => user.info.deactivated,
                    "id" => user.id,
                    "nickname" => user.nickname,
-                   "roles" => %{"admin" => false, "moderator" => false}
+                   "roles" => %{"admin" => false, "moderator" => false},
+                   "local" => false,
+                   "tags" => ["foo", "bar"]
                  }
                ]
              }
@@ -395,7 +399,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                    "id" => user.id,
                    "nickname" => user.nickname,
                    "roles" => %{"admin" => false, "moderator" => false},
-                   "local" => true
+                   "local" => true,
+                   "tags" => []
                  }
                ]
              }
@@ -420,7 +425,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                    "id" => user.id,
                    "nickname" => user.nickname,
                    "roles" => %{"admin" => false, "moderator" => false},
-                   "local" => true
+                   "local" => true,
+                   "tags" => []
                  }
                ]
              }
@@ -439,7 +445,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                    "id" => user2.id,
                    "nickname" => user2.nickname,
                    "roles" => %{"admin" => false, "moderator" => false},
-                   "local" => true
+                   "local" => true,
+                   "tags" => []
                  }
                ]
              }
@@ -465,7 +472,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                    "id" => user.id,
                    "nickname" => user.nickname,
                    "roles" => %{"admin" => false, "moderator" => false},
-                   "local" => true
+                   "local" => true,
+                   "tags" => []
                  }
                ]
              }
@@ -486,19 +494,21 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                "count" => 2,
                "page_size" => 50,
                "users" => [
-                 %{
-                   "deactivated" => admin.info.deactivated,
-                   "id" => admin.id,
-                   "nickname" => admin.nickname,
-                   "roles" => %{"admin" => true, "moderator" => false},
-                   "local" => true
-                 },
                  %{
                    "deactivated" => user.info.deactivated,
                    "id" => user.id,
                    "nickname" => user.nickname,
                    "roles" => %{"admin" => false, "moderator" => false},
-                   "local" => true
+                   "local" => true,
+                   "tags" => []
+                 },
+                 %{
+                   "deactivated" => admin.info.deactivated,
+                   "id" => admin.id,
+                   "nickname" => admin.nickname,
+                   "roles" => %{"admin" => true, "moderator" => false},
+                   "local" => true,
+                   "tags" => []
                  }
                ]
              }
@@ -520,7 +530,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                "id" => user.id,
                "nickname" => user.nickname,
                "roles" => %{"admin" => false, "moderator" => false},
-               "local" => true
+               "local" => true,
+               "tags" => []
              }
   end
 end