summaryrefslogtreecommitdiff
path: root/test/web/plugs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-03-29 06:57:34 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-03-29 06:57:34 +0300
commitdfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch)
tree92d77142391ed6eab45a4bec792ed02be91fbe39 /test/web/plugs
parentedb659dc579fe56227adef0b0704ff13b6ef717e (diff)
parent4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff)
downloadpleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz
pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/plugs')
-rw-r--r--test/web/plugs/federating_plug_test.exs2
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)