diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-16 17:58:42 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-16 17:58:42 +0300 |
| commit | 0e07c5ef5717460d37336129cb657ba11091f09d (patch) | |
| tree | 801cb7957ebe2e4f227f089afc902ea2084eaf27 /test/web/twitter_api/remote_follow_controller_test.exs | |
| parent | 7c8003c3fcdcab075b9722ab236bf2d1d0e0e8cd (diff) | |
| parent | b80958d4e3fb9cdbb9b10149a52f1441edb4b1e3 (diff) | |
| download | pleroma-0e07c5ef5717460d37336129cb657ba11091f09d.tar.gz pleroma-0e07c5ef5717460d37336129cb657ba11091f09d.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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/web/twitter_api/remote_follow_controller_test.exs b/test/web/twitter_api/remote_follow_controller_test.exs index 80a42989d..73062f18f 100644 --- a/test/web/twitter_api/remote_follow_controller_test.exs +++ b/test/web/twitter_api/remote_follow_controller_test.exs @@ -5,8 +5,10 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do use Pleroma.Web.ConnCase + alias Pleroma.Config alias Pleroma.User alias Pleroma.Web.CommonAPI + import ExUnit.CaptureLog import Pleroma.Factory @@ -15,6 +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]) |