summaryrefslogtreecommitdiff
path: root/test/activity_expiration_test.exs
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-08-13 17:38:19 +0000
committerfeld <feld@feld.me>2020-08-13 17:38:19 +0000
commit14a06e63f661cc964a799a62c87103a00ba0c5e0 (patch)
treeb35b19c925a40b273f63ac00e18f8fa8645c7ad8 /test/activity_expiration_test.exs
parentfbc220d09c25057edfc1eae539fdb68d0cc7a933 (diff)
parent29a7bcd5bbb3a39fe1b31c9f5ffc0077f23fc101 (diff)
downloadpleroma-14a06e63f661cc964a799a62c87103a00ba0c5e0.tar.gz
pleroma-14a06e63f661cc964a799a62c87103a00ba0c5e0.zip
Merge branch 'fix/activity-expirations-again' into 'develop'
Fix activity expirations again See merge request pleroma/pleroma!2866
Diffstat (limited to 'test/activity_expiration_test.exs')
-rw-r--r--test/activity_expiration_test.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/activity_expiration_test.exs b/test/activity_expiration_test.exs
index d75c06cc7..f86d79826 100644
--- a/test/activity_expiration_test.exs
+++ b/test/activity_expiration_test.exs
@@ -11,7 +11,10 @@ defmodule Pleroma.ActivityExpirationTest do
test "finds activities due to be deleted only" do
activity = insert(:note_activity)
- expiration_due = insert(:expiration_in_the_past, %{activity_id: activity.id})
+
+ expiration_due =
+ insert(:expiration_in_the_past, %{activity_id: activity.id}) |> Repo.preload(:activity)
+
activity2 = insert(:note_activity)
insert(:expiration_in_the_future, %{activity_id: activity2.id})