diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-25 09:05:17 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-25 09:05:17 +0300 |
commit | 012d428e1ffdd83888f339e4dbaec344202eebe1 (patch) | |
tree | 41483fdfb5c75e6d338ad48b83f7d4e621365694 /test/web/static_fe/static_fe_controller_test.exs | |
parent | e743c2232970e321c833604b232520587ad8e402 (diff) | |
parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
download | pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.tar.gz pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
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") |