diff options
| author | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
| commit | d23e81903dfe5032bb20b92bcc7dfb47434ba669 (patch) | |
| tree | db7724289ac074e0b70b7405d9080e50b8a8175d /test/web/pleroma_api/controllers/emoji_api_controller_test.exs | |
| parent | 5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff) | |
| parent | 1c05f539aaea32fe993e5299e656aa44c322e8de (diff) | |
| download | pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.tar.gz pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.zip | |
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
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 | 5 |
1 files changed, 1 insertions, 4 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 4b9f5cf9a..435fb6592 100644 --- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs @@ -12,10 +12,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do Pleroma.Config.get!([:instance, :static_dir]), "emoji" ) - - clear_config([:auth, :enforce_oauth_admin_scope_usage]) do - Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], false) - end + setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], false) test "shared & non-shared pack information in list_packs is ok" do conn = build_conn() |