projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactv...
[akkoma]
/
test
/
web
/
plugs
/
federating_plug_test.exs
diff --git
a/test/web/plugs/federating_plug_test.exs
b/test/web/plugs/federating_plug_test.exs
index 13edc435960e2a53c632e9343514b08774160a0c..2f8aadadcfac1d98a605ade71b302265f0083d5b 100644
(file)
--- 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
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)
test "returns and halt the conn when federating is disabled" do
Pleroma.Config.put([:instance, :federating], false)