summaryrefslogtreecommitdiff
path: root/test/web/federator_test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-11-06 15:09:52 +0000
committerlambda <pleromagit@rogerbraun.net>2018-11-06 15:09:52 +0000
commit25512aa29cae22b73ee45a22954693c1a130ea3e (patch)
treeef0f639fe4c57cf9160d0e69e2918461ecf9a008 /test/web/federator_test.exs
parent0f6c4635a64e89cc72921456e6cfa3d488d894bf (diff)
parent7d328c658da69ec236d10fa89d23f2a6886b3205 (diff)
downloadpleroma-25512aa29cae22b73ee45a22954693c1a130ea3e.tar.gz
pleroma-25512aa29cae22b73ee45a22954693c1a130ea3e.zip
Merge branch 'remove-config-agent' into 'develop'
Get rid of Pleroma.Config in favor of Application See merge request pleroma/pleroma!428
Diffstat (limited to 'test/web/federator_test.exs')
-rw-r--r--test/web/federator_test.exs7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs
index 966702935..c709d1181 100644
--- a/test/web/federator_test.exs
+++ b/test/web/federator_test.exs
@@ -1,7 +1,6 @@
defmodule Pleroma.Web.FederatorTest do
alias Pleroma.Web.Federator
alias Pleroma.Web.CommonAPI
- alias Pleroma.Config
use Pleroma.DataCase
import Pleroma.Factory
import Mock
@@ -40,8 +39,6 @@ defmodule Pleroma.Web.FederatorTest do
activity: activity,
relay_mock: relay_mock
} do
- Config.put([:instance, :allow_relay], true)
-
with_mocks([relay_mock]) do
Federator.handle(:publish, activity)
end
@@ -53,13 +50,15 @@ defmodule Pleroma.Web.FederatorTest do
activity: activity,
relay_mock: relay_mock
} do
- Config.put([:instance, :allow_relay], false)
+ Pleroma.Config.put([:instance, :allow_relay], false)
with_mocks([relay_mock]) do
Federator.handle(:publish, activity)
end
refute_received :relay_publish
+
+ Pleroma.Config.put([:instance, :allow_relay], true)
end
end
end