diff options
author | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
commit | e1a1c8e7de5e10fa64d168dc5d35a80b96767395 (patch) | |
tree | c0057448e323c730bea2c76cecf9efb85ef14181 /test/web/admin_api/controllers/report_controller_test.exs | |
parent | 4a6389316dac53c1ca2ec36d160690476d881185 (diff) | |
parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
download | pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.tar.gz pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.zip |
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
Diffstat (limited to 'test/web/admin_api/controllers/report_controller_test.exs')
-rw-r--r-- | test/web/admin_api/controllers/report_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/admin_api/controllers/report_controller_test.exs b/test/web/admin_api/controllers/report_controller_test.exs index 940bce340..f30dc8956 100644 --- a/test/web/admin_api/controllers/report_controller_test.exs +++ b/test/web/admin_api/controllers/report_controller_test.exs @@ -297,7 +297,7 @@ defmodule Pleroma.Web.AdminAPI.ReportControllerTest do |> get("/api/pleroma/admin/reports") assert json_response(conn, :forbidden) == - %{"error" => "User is not an admin or OAuth admin scope is not granted."} + %{"error" => "User is not an admin."} end test "returns 403 when requested by anonymous" do |