diff options
author | lain <lain@soykaf.club> | 2020-04-06 17:50:31 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-04-06 17:50:31 +0200 |
commit | 19335be24c25739e2334180af6c59dd8919d5fc8 (patch) | |
tree | db34531b2dd5befb495d4379aa8aaad9284fa72c /test/web/static_fe/static_fe_controller_test.exs | |
parent | fd97b0e634d30dec3217efcf3d67610d1b54bf8b (diff) | |
parent | 1d4ab06505ec5143dbb1d78d718fa9efd1497751 (diff) | |
download | pleroma-19335be24c25739e2334180af6c59dd8919d5fc8.tar.gz pleroma-19335be24c25739e2334180af6c59dd8919d5fc8.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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") |