diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 09:30:30 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 09:30:30 +0300 |
| commit | b8d5c09f48a4b643f0dc60930bc69772a32a3b5e (patch) | |
| tree | 59d1903f2d204b8a5e244430cb17ef772ced5f4e /test/web/pleroma_api/controllers/emoji_api_controller_test.exs | |
| parent | b7908844f24f4ede4244261d43f30ed3724efbb7 (diff) | |
| parent | 71bffbf0b7a3f0e245408a977c48a51763021508 (diff) | |
| download | pleroma-b8d5c09f48a4b643f0dc60930bc69772a32a3b5e.tar.gz pleroma-b8d5c09f48a4b643f0dc60930bc69772a32a3b5e.zip | |
Merge branch 'develop' into issue/1383
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) |