projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
[akkoma]
/
test
/
web
/
admin_api
/
admin_api_controller_test.exs
diff --git
a/test/web/admin_api/admin_api_controller_test.exs
b/test/web/admin_api/admin_api_controller_test.exs
index 96cb95da646a93172d1f20f4d6af2cb8b383550c..0aab7f26257490fd612317491323587458c77a26 100644
(file)
--- 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})
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()
conn =
build_conn()
@@
-350,14
+350,16
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"id" => admin.id,
"nickname" => admin.nickname,
"roles" => %{"admin" => true, "moderator" => false},
"id" => admin.id,
"nickname" => admin.nickname,
"roles" => %{"admin" => true, "moderator" => false},
- "local" => true
+ "local" => true,
+ "tags" => []
},
%{
"deactivated" => user.info.deactivated,
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
},
%{
"deactivated" => user.info.deactivated,
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
- "local" => true
+ "local" => false,
+ "tags" => ["foo", "bar"]
}
]
}
}
]
}
@@
-397,7
+399,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
- "local" => true
+ "local" => true,
+ "tags" => []
}
]
}
}
]
}
@@
-422,7
+425,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
- "local" => true
+ "local" => true,
+ "tags" => []
}
]
}
}
]
}
@@
-441,7
+445,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"id" => user2.id,
"nickname" => user2.nickname,
"roles" => %{"admin" => false, "moderator" => false},
"id" => user2.id,
"nickname" => user2.nickname,
"roles" => %{"admin" => false, "moderator" => false},
- "local" => true
+ "local" => true,
+ "tags" => []
}
]
}
}
]
}
@@
-467,7
+472,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
- "local" => true
+ "local" => true,
+ "tags" => []
}
]
}
}
]
}
@@
-488,19
+494,21
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"count" => 2,
"page_size" => 50,
"users" => [
"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},
%{
"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" => []
}
]
}
}
]
}
@@
-522,7
+530,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
"id" => user.id,
"nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false},
- "local" => true
+ "local" => true,
+ "tags" => []
}
end
end
}
end
end