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/static_fe/static_fe_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/static_fe/static_fe_controller_test.exs')
-rw-r--r-- | test/web/static_fe/static_fe_controller_test.exs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/web/static_fe/static_fe_controller_test.exs b/test/web/static_fe/static_fe_controller_test.exs index c3d2ae3b4..430683ea0 100644 --- a/test/web/static_fe/static_fe_controller_test.exs +++ b/test/web/static_fe/static_fe_controller_test.exs @@ -8,13 +8,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do import Pleroma.Factory - clear_config_all([:static_fe, :enabled]) do - Config.put([:static_fe, :enabled], true) - end - - clear_config([:instance, :federating]) do - Config.put([:instance, :federating], true) - end + setup_all do: clear_config([:static_fe, :enabled], true) + setup do: clear_config([:instance, :federating], true) setup %{conn: conn} do conn = put_req_header(conn, "accept", "text/html") |