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/plugs | |
| 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/plugs')
| -rw-r--r-- | test/web/plugs/federating_plug_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/plugs/federating_plug_test.exs b/test/web/plugs/federating_plug_test.exs index 13edc4359..2f8aadadc 100644 --- a/test/web/plugs/federating_plug_test.exs +++ b/test/web/plugs/federating_plug_test.exs @@ -5,7 +5,7 @@ defmodule Pleroma.Web.FederatingPlugTest do use Pleroma.Web.ConnCase - clear_config([:instance, :federating]) + setup do: clear_config([:instance, :federating]) test "returns and halt the conn when federating is disabled" do Pleroma.Config.put([:instance, :federating], false) |