diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-16 15:31:31 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-16 15:31:31 +0400 |
| commit | 421e35b578b3fc109f820f693e91139a3e3f8970 (patch) | |
| tree | 37da58962582854597cd068c603b8ba23e10f7bb /test/web/twitter_api/remote_follow_controller_test.exs | |
| parent | d1c7f8e576e31487544b57d67802843b8ef38388 (diff) | |
| parent | c2527b8c63a4e35b121981efe2c39cc54c77648d (diff) | |
| download | pleroma-421e35b578b3fc109f820f693e91139a3e3f8970.tar.gz pleroma-421e35b578b3fc109f820f693e91139a3e3f8970.zip | |
Merge branch 'develop' into global-status-expiration
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]) |