diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-07-03 10:36:41 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-07-03 10:36:41 -0500 |
commit | 4695bdd81bf9d2caed4337473d35ba021527e8a8 (patch) | |
tree | 0bc60c1bbc03d994701a282f47d32e856b54cff0 /test/workers/cron | |
parent | cc837f9d157f9d43a015a8908f5e2ee178442041 (diff) | |
parent | c2a052a346d5104c3657343a885255d4d7179c75 (diff) | |
download | pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.tar.gz pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.zip |
Merge branch 'develop' into issue/1790-updated-oban
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 5b2ffbc4c..d1acd9ae6 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) |