Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'
Backport a test fix to 1.1 See merge request pleroma/pleroma!1671
This commit is contained in:
commit
6c3f5e8ba0
@ -213,7 +213,11 @@ defmodule Pleroma.ActivityTest do
|
|||||||
|
|
||||||
assert [] == Activity.all_by_actor_and_id(user, [])
|
assert [] == Activity.all_by_actor_and_id(user, [])
|
||||||
|
|
||||||
assert [%Activity{id: ^id2}, %Activity{id: ^id1}] =
|
activities =
|
||||||
Activity.all_by_actor_and_id(user.ap_id, [id1, id2])
|
user.ap_id
|
||||||
|
|> Activity.all_by_actor_and_id([id1, id2])
|
||||||
|
|> Enum.sort(&(&1.id < &2.id))
|
||||||
|
|
||||||
|
assert [%Activity{id: ^id1}, %Activity{id: ^id2}] = activities
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user