mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

update changelog

Browse source
This commit is contained in:
Maksim Pechnikov 2020-09-25 16:50:47 +03:00
parent 51189ad365
commit add26817e3
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -32,6 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Pleroma API: Importing the mutes users from CSV files. - Pleroma API: Importing the mutes users from CSV files.
- Admin API: Importing emoji from a zip file - Admin API: Importing emoji from a zip file
- Pleroma API: Pagination for remote/local packs and emoji. - Pleroma API: Pagination for remote/local packs and emoji.
- Admin API: (`GET /api/pleroma/admin/users`) added filters user by `unconfirmed` status
- Admin API: (`GET /api/pleroma/admin/users`) added filters user by `actor_type`
</details> </details>

42
test/web/admin_api/controllers/user_controller_test.exs
View file

@ -671,12 +671,12 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
conn = get(conn, "/api/pleroma/admin/users?filters=need_approval") conn = get(conn, "/api/pleroma/admin/users?filters=need_approval")
users = users = [
[ user_response(
user_response(user, user,
%{"approval_pending" => true, "registration_reason" => "Plz let me in!"} %{"approval_pending" => true, "registration_reason" => "Plz let me in!"}
) )
] ]
assert json_response(conn, 200) == %{ assert json_response(conn, 200) == %{
"count" => 1, "count" => 1,
@ -724,9 +724,9 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
"page_size" => 50, "page_size" => 50,
"users" => [ "users" => [
user_response(moderator, %{ user_response(moderator, %{
"deactivated" => false, "deactivated" => false,
"roles" => %{"admin" => false, "moderator" => true} "roles" => %{"admin" => false, "moderator" => true}
}) })
] ]
} }
end end
@ -738,9 +738,10 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
user1 = insert(:user) user1 = insert(:user)
user2 = insert(:user) user2 = insert(:user)
response = conn response =
|> get(user_path(conn, :list), %{actor_types: ["Person"]}) conn
|> json_response(200) |> get(user_path(conn, :list), %{actor_types: ["Person"]})
|> json_response(200)
users = users =
[ [
@ -760,9 +761,10 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
user1 = insert(:user) user1 = insert(:user)
user2 = insert(:user) user2 = insert(:user)
response = conn response =
|> get(user_path(conn, :list), %{actor_types: ["Person", "Service"]}) conn
|> json_response(200) |> get(user_path(conn, :list), %{actor_types: ["Person", "Service"]})
|> json_response(200)
users = users =
[ [
@ -782,12 +784,14 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
insert(:user) insert(:user)
insert(:user) insert(:user)
response = conn response =
|> get(user_path(conn, :list), %{actor_types: ["Service"]}) conn
|> json_response(200) |> get(user_path(conn, :list), %{actor_types: ["Service"]})
|> json_response(200)
users = [user_response(user_service, %{"actor_type" => "Service"})] users = [user_response(user_service, %{"actor_type" => "Service"})]
assert response == %{"count" => 1, "page_size" => 50, "users" => users } assert response == %{"count" => 1, "page_size" => 50, "users" => users}
end end
test "load users with tags list", %{conn: conn} do test "load users with tags list", %{conn: conn} do