diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-20 22:08:34 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-20 22:08:34 +0400 |
| commit | 80e15716102e03323b117ade919035402cc7408f (patch) | |
| tree | 60b57dde12b4feb693a6383b71f813561a48a928 /test/web/ostatus | |
| parent | 5ad54d1bd556f3dc957aa1d2ebe6314618e75399 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-80e15716102e03323b117ade919035402cc7408f.tar.gz pleroma-80e15716102e03323b117ade919035402cc7408f.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/ostatus')
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index 3b84358e4..6787b414b 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -17,9 +17,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do :ok end - clear_config([:instance, :federating]) do - Config.put([:instance, :federating], true) - end + setup do: clear_config([:instance, :federating], true) # Note: see ActivityPubControllerTest for JSON format tests describe "GET /objects/:uuid (text/html)" do |