projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chat moderation: fix formatting
[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 beac55fb270c31487e35a728f31e6a2959638a43..d1acd9ae6cf1f05600e048392b09b32033686374 100644
(file)
--- 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])
setup do
clear_config([ActivityExpiration, :enabled])
- clear_config([:instance, :rewrite_policy])
end
test "deletes an expiration activity" do
end
test "deletes an expiration activity" do
@@
-33,7
+32,7
@@
defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
%{activity_id: activity.id, scheduled_at: naive_datetime}
)
%{activity_id: activity.id, scheduled_at: naive_datetime}
)
- Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker.perform(
:ops, :pid
)
+ Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker.perform(
%Oban.Job{}
)
refute Pleroma.Repo.get(Pleroma.Activity, activity.id)
refute Pleroma.Repo.get(Pleroma.ActivityExpiration, expiration.id)
refute Pleroma.Repo.get(Pleroma.Activity, activity.id)
refute Pleroma.Repo.get(Pleroma.ActivityExpiration, expiration.id)
@@
-42,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)
@@
-62,7
+58,7
@@
defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
|> Ecto.Changeset.change(%{scheduled_at: past_date})
|> Repo.update!()
|> Ecto.Changeset.change(%{scheduled_at: past_date})
|> Repo.update!()
- Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker.perform(
:ops, :pid
)
+ Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker.perform(
%Oban.Job{}
)
assert [%{data: %{"type" => "Delete", "deleted_activity_id" => ^id}}] =
Pleroma.Repo.all(Pleroma.Activity)
assert [%{data: %{"type" => "Delete", "deleted_activity_id" => ^id}}] =
Pleroma.Repo.all(Pleroma.Activity)