sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'

Browse Source 
Backport a test fix to 1.1

See merge request pleroma/pleroma!1671
This commit is contained in:
rinpatch 2019-09-14 18:14:54 +00:00
commit 6c3f5e8ba0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/activity_test.exs
View File

@ -213,7 +213,11 @@ test "all_by_actor_and_id/2" 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