summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/mrf
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-06-23 16:38:27 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-06-23 16:38:27 +0000
commitc7d69e925664ce7125c3938c298d72e94a2a1349 (patch)
tree717028080c5c6a84b0362e67e86aa8a51b2c005b /test/web/activity_pub/mrf
parentb7f297f0bd214416f3faded4a6221899b68edabd (diff)
parent9a82de219c264f467b485316570c5425e3fe2f00 (diff)
downloadpleroma-c7d69e925664ce7125c3938c298d72e94a2a1349.tar.gz
pleroma-c7d69e925664ce7125c3938c298d72e94a2a1349.zip
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
Diffstat (limited to 'test/web/activity_pub/mrf')
-rw-r--r--test/web/activity_pub/mrf/mrf_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/web/activity_pub/mrf/mrf_test.exs b/test/web/activity_pub/mrf/mrf_test.exs
index c941066f2..a63b25423 100644
--- a/test/web/activity_pub/mrf/mrf_test.exs
+++ b/test/web/activity_pub/mrf/mrf_test.exs
@@ -60,8 +60,6 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
end
describe "describe/0" do
- setup do: clear_config([:instance, :rewrite_policy])
-
test "it works as expected with noop policy" do
expected = %{
mrf_policies: ["NoOpPolicy"],
@@ -72,7 +70,7 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
end
test "it works as expected with mock policy" do
- Pleroma.Config.put([:instance, :rewrite_policy], [MRFModuleMock])
+ clear_config([:mrf, :policies], [MRFModuleMock])
expected = %{
mrf_policies: ["MRFModuleMock"],