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/twitter_api/remote_follow_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/twitter_api/remote_follow_controller_test.exs')
-rw-r--r-- | test/web/twitter_api/remote_follow_controller_test.exs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/web/twitter_api/remote_follow_controller_test.exs b/test/web/twitter_api/remote_follow_controller_test.exs index 73062f18f..5ff8694a8 100644 --- a/test/web/twitter_api/remote_follow_controller_test.exs +++ b/test/web/twitter_api/remote_follow_controller_test.exs @@ -17,13 +17,10 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do :ok end - clear_config_all([:instance, :federating]) do - Config.put([:instance, :federating], true) - end - - clear_config([:instance]) - clear_config([:frontend_configurations, :pleroma_fe]) - clear_config([:user, :deny_follow_blocked]) + setup_all do: clear_config([:instance, :federating], true) + setup do: clear_config([:instance]) + setup do: clear_config([:frontend_configurations, :pleroma_fe]) + setup do: clear_config([:user, :deny_follow_blocked]) describe "GET /ostatus_subscribe - remote_follow/2" do test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do |