hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/1825-admin-api-error-codes' into 'develop'

Browse source 
Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665
This commit is contained in:
lain 2020-06-22 12:25:12 +00:00
commit 8b5bdd164e
4 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/admin_api/controllers/admin_api_controller_test.exs
View file

@ -1599,14 +1599,14 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert patch(conn, "/api/pleroma/admin/users/#{user.nickname}/credentials", %{
"actor_type" => "Application"
})
|> json_response(200) == %{"errors" => %{"actor_type" => "is invalid"}}
|> json_response(400) == %{"errors" => %{"actor_type" => "is invalid"}}
end
test "update non existing user", %{conn: conn} do
assert patch(conn, "/api/pleroma/admin/users/non-existing/credentials", %{
"password" => "new_password"
})
|> json_response(200) == %{"error" => "Unable to update user."}
|> json_response(404) == %{"error" => "Not found"}
end
end