diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 | 
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 | 
| commit | 9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch) | |
| tree | e6755e3d585d753ad7da171a858508d4a1603a49 /test/web/static_fe | |
| parent | 51ce0813d351cad900966aea49a6f6d17d33f964 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip  | |
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/static_fe')
| -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")  | 
