diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 16:38:27 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 16:38:27 +0000 |
| commit | c7d69e925664ce7125c3938c298d72e94a2a1349 (patch) | |
| tree | 717028080c5c6a84b0362e67e86aa8a51b2c005b /test/workers/cron | |
| parent | b7f297f0bd214416f3faded4a6221899b68edabd (diff) | |
| parent | 9a82de219c264f467b485316570c5425e3fe2f00 (diff) | |
| download | pleroma-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/workers/cron')
| -rw-r--r-- | test/workers/cron/purge_expired_activities_worker_test.exs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/workers/cron/purge_expired_activities_worker_test.exs b/test/workers/cron/purge_expired_activities_worker_test.exs index 6d2991a60..b1db59fdf 100644 --- a/test/workers/cron/purge_expired_activities_worker_test.exs +++ b/test/workers/cron/purge_expired_activities_worker_test.exs @@ -13,7 +13,6 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do setup do clear_config([ActivityExpiration, :enabled]) - clear_config([:instance, :rewrite_policy]) end test "deletes an expiration activity" do @@ -42,10 +41,7 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do test "works with ActivityExpirationPolicy" do Pleroma.Config.put([ActivityExpiration, :enabled], true) - Pleroma.Config.put( - [:instance, :rewrite_policy], - Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy - ) + clear_config([:mrf, :policies], Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy) user = insert(:user) |