projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
[akkoma]
/
test
/
workers
/
cron
/
purge_expired_activities_worker_test.exs
diff --git
a/test/workers/cron/purge_expired_activities_worker_test.exs
b/test/workers/cron/purge_expired_activities_worker_test.exs
index c6c7ff388fa1eac2d867f094992b38406b4a66da..b1db59fdf8876eb89ae3d64a715711af70365b69 100644
(file)
--- a/
test/workers/cron/purge_expired_activities_worker_test.exs
+++ b/
test/workers/cron/purge_expired_activities_worker_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
@@
-11,8
+11,9
@@
defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
import Pleroma.Factory
import ExUnit.CaptureLog
import Pleroma.Factory
import ExUnit.CaptureLog
- clear_config([ActivityExpiration, :enabled])
- clear_config([:instance, :rewrite_policy])
+ setup do
+ clear_config([ActivityExpiration, :enabled])
+ end
test "deletes an expiration activity" do
Pleroma.Config.put([ActivityExpiration, :enabled], true)
test "deletes an expiration activity" do
Pleroma.Config.put([ActivityExpiration, :enabled], true)
@@
-40,16
+41,13
@@
defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
test "works with ActivityExpirationPolicy" do
Pleroma.Config.put([ActivityExpiration, :enabled], true)
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)
days = Pleroma.Config.get([:mrf_activity_expiration, :days], 365)
user = insert(:user)
days = Pleroma.Config.get([:mrf_activity_expiration, :days], 365)
- {:ok, %{id: id} = activity} = Pleroma.Web.CommonAPI.post(user, %{
"status" =>
"cofe"})
+ {:ok, %{id: id} = activity} = Pleroma.Web.CommonAPI.post(user, %{
status:
"cofe"})
past_date =
NaiveDateTime.utc_now() |> Timex.shift(days: -days) |> NaiveDateTime.truncate(:second)
past_date =
NaiveDateTime.utc_now() |> Timex.shift(days: -days) |> NaiveDateTime.truncate(:second)