summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/mrf/simple_policy_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-08-24 15:48:33 +0200
committerlain <lain@soykaf.club>2019-08-24 15:48:33 +0200
commitcc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a (patch)
treee80078875de15734e045f39e0bd9f82310961201 /test/web/activity_pub/mrf/simple_policy_test.exs
parent0e2b5a3e6aed7947909c2a1ff1618403546f1572 (diff)
parentbc78a875c86db42d67122cfb767f239a55dacbea (diff)
downloadpleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.tar.gz
pleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.zip
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
Diffstat (limited to 'test/web/activity_pub/mrf/simple_policy_test.exs')
-rw-r--r--test/web/activity_pub/mrf/simple_policy_test.exs8
1 files changed, 1 insertions, 7 deletions
diff --git a/test/web/activity_pub/mrf/simple_policy_test.exs b/test/web/activity_pub/mrf/simple_policy_test.exs
index 8e86d2219..7203b27da 100644
--- a/test/web/activity_pub/mrf/simple_policy_test.exs
+++ b/test/web/activity_pub/mrf/simple_policy_test.exs
@@ -8,9 +8,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
alias Pleroma.Config
alias Pleroma.Web.ActivityPub.MRF.SimplePolicy
- setup do
- orig = Config.get!(:mrf_simple)
-
+ clear_config([:mrf_simple]) do
Config.put(:mrf_simple,
media_removal: [],
media_nsfw: [],
@@ -21,10 +19,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
avatar_removal: [],
banner_removal: []
)
-
- on_exit(fn ->
- Config.put(:mrf_simple, orig)
- end)
end
describe "when :media_removal" do