hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'remove/workerhelper' into 'develop'

Browse source 
Remove WorkerHelper

See merge request pleroma/pleroma!4166
This commit is contained in:
feld 2024-08-07 13:26:41 +00:00
commit a2490ddd9f
43 changed files with 208 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/mix/tasks/pleroma/database_test.exs
View file

@ -623,10 +623,12 @@ defmodule Mix.Tasks.Pleroma.DatabaseTest do
expires_at = DateTime.add(DateTime.utc_now(), 60 * 61)
Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
activity_id: activity_id3,
expires_at: expires_at
})
Pleroma.Workers.PurgeExpiredActivity.enqueue(
%{
activity_id: activity_id3
},
scheduled_at: expires_at
)
Mix.Tasks.Pleroma.Database.run(["ensure_expiration"])

30
test/pleroma/workers/purge_expired_activity_test.exs
View file

@ -14,10 +14,12 @@ defmodule Pleroma.Workers.PurgeExpiredActivityTest do
activity = insert(:note_activity)
assert {:ok, _} =
PurgeExpiredActivity.enqueue(%{
activity_id: activity.id,
expires_at: DateTime.add(DateTime.utc_now(), 3601)
})
PurgeExpiredActivity.enqueue(
%{
activity_id: activity.id
},
scheduled_at: DateTime.add(DateTime.utc_now(), 3601)
)
assert_enqueued(
worker: Pleroma.Workers.PurgeExpiredActivity,
@ -34,10 +36,12 @@ defmodule Pleroma.Workers.PurgeExpiredActivityTest do
activity = insert(:note_activity)
assert {:ok, _} =
PurgeExpiredActivity.enqueue(%{
activity_id: activity.id,
expires_at: DateTime.add(DateTime.utc_now(), 3601)
})
PurgeExpiredActivity.enqueue(
%{
activity_id: activity.id
},
scheduled_at: DateTime.add(DateTime.utc_now(), 3601)
)
user = Pleroma.User.get_by_ap_id(activity.actor)
Pleroma.Repo.delete(user)
@ -48,10 +52,12 @@ defmodule Pleroma.Workers.PurgeExpiredActivityTest do
test "error if actiivity was not found" do
assert {:ok, _} =
PurgeExpiredActivity.enqueue(%{
activity_id: "some_id",
expires_at: DateTime.add(DateTime.utc_now(), 3601)
})
PurgeExpiredActivity.enqueue(
%{
activity_id: "some_id"
},
scheduled_at: DateTime.add(DateTime.utc_now(), 3601)
)
assert {:cancel, :activity_not_found} =
perform_job(Pleroma.Workers.PurgeExpiredActivity, %{activity_id: "some_if"})