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/twitter_api/remote_follow_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/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 |