summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-01-21 10:32:27 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-01-21 10:32:27 +0300
commit503d966e9f7d4c41a1bfbd215b375443a858564a (patch)
tree634499f234fcd8d9f2b81523c66eaaf339ee52f8 /test/web/pleroma_api/controllers/emoji_api_controller_test.exs
parentdcae5914d1f7d540e3c20be5988d5e3547a349cd (diff)
parentab36459464311389c2929ff1c48537889066a9f8 (diff)
downloadpleroma-503d966e9f7d4c41a1bfbd215b375443a858564a.tar.gz
pleroma-503d966e9f7d4c41a1bfbd215b375443a858564a.zip
Merge branch 'develop' into admin-be
Diffstat (limited to 'test/web/pleroma_api/controllers/emoji_api_controller_test.exs')
-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)