diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-20 12:55:51 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-20 12:55:51 -0600 |
| commit | 390bf9b097cab96b9d3a0214f974044667524442 (patch) | |
| tree | 2f0a6fbefb264dcedb12910870db0f9aea8c3d29 /test/web/pleroma_api/controllers/emoji_api_controller_test.exs | |
| parent | cde828ff7df64740f36b2fc9dfdbfc8d76a8a78d (diff) | |
| parent | ab36459464311389c2929ff1c48537889066a9f8 (diff) | |
| download | pleroma-390bf9b097cab96b9d3a0214f974044667524442.tar.gz pleroma-390bf9b097cab96b9d3a0214f974044667524442.zip | |
Merge branch 'develop' into fix/attachments-cleanup
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.exs | 4 |
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) |