summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-15 19:11:13 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-15 19:11:13 +0300
commita5db044e579ed9923e610cdf89dff6146d9b0986 (patch)
treef72f321dc438f1bba4e3a8ceb6edbc139cdaad92 /test/web/pleroma_api/controllers/emoji_api_controller_test.exs
parentaa9fe3a712ac14dd2ee3227e6066bd3c47e9a5f3 (diff)
parent6317183acd767ba0ae1a245119d0276696444d92 (diff)
downloadpleroma-a5db044e579ed9923e610cdf89dff6146d9b0986.tar.gz
pleroma-a5db044e579ed9923e610cdf89dff6146d9b0986.zip
Merge branch 'develop' into feature/tag_feed
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)