projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
[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 bb2ca6a62d293ecb7e95ce9845af1b06941f2fde..d0131fd903ea6f19371786ed75630f91c67d5fdf 100644
(file)
--- a/
test/web/admin_api/admin_api_controller_test.exs
+++ b/
test/web/admin_api/admin_api_controller_test.exs
@@
-1559,7
+1559,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
|> assign(:user, user)
|> get("/api/pleroma/admin/reports")
|> assign(:user, user)
|> get("/api/pleroma/admin/reports")
- assert json_response(conn, :forbidden) == %{"error" => "User is not admin."}
+ assert json_response(conn, :forbidden) ==
+ %{"error" => "User is not an admin or OAuth admin scope is not granted."}
end
test "returns 403 when requested by anonymous" do
end
test "returns 403 when requested by anonymous" do
@@
-1923,6
+1924,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
Pleroma.Config.put([:instance, :dynamic_configuration], true)
end
Pleroma.Config.put([:instance, :dynamic_configuration], true)
end
+ @tag capture_log: true
test "create new config setting in db", %{conn: conn} do
conn =
post(conn, "/api/pleroma/admin/config", %{
test "create new config setting in db", %{conn: conn} do
conn =
post(conn, "/api/pleroma/admin/config", %{