summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-01-15 15:44:49 +0000
committerlain <lain@soykaf.club>2020-01-15 15:44:49 +0000
commit6317183acd767ba0ae1a245119d0276696444d92 (patch)
tree340df0fe8bcbedd20e5e7a33b6a472acea2456bf /test/web/pleroma_api
parent1b233aa6531b26943bd78c5d4cd8e00f2e1d318e (diff)
parentd1e9768e10673b99565883b6450c7fd57657cbad (diff)
downloadpleroma-6317183acd767ba0ae1a245119d0276696444d92.tar.gz
pleroma-6317183acd767ba0ae1a245119d0276696444d92.zip
Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'
[#1478] OAuth `admin` scopes tweaks Closes #1478 See merge request pleroma/pleroma!2081
Diffstat (limited to 'test/web/pleroma_api')
-rw-r--r--test/web/pleroma_api/controllers/emoji_api_controller_test.exs4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
index e1b484dae..8e76f2f3d 100644
--- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@ -14,6 +14,10 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
"emoji"
)
+ clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+ Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
+ end
+
test "shared & non-shared pack information in list_packs is ok" do
conn = build_conn()
resp = conn |> get(emoji_api_path(conn, :list_packs)) |> json_response(200)