diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
| commit | 212c31c63796a21233e8decf7ce46853383286fd (patch) | |
| tree | 0cc01fbf91ddb5037d67b39f0af80737aeec51ad /test/web/static_fe/static_fe_controller_test.exs | |
| parent | 64165d1df95bc3a22260dafa4584471427685864 (diff) | |
| parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
| download | pleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip | |
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
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") |