Merge branch 'fix-tests' into 'develop'

Fix `Activity.all_by_actor_and_id/2` test

See merge request pleroma/pleroma!1668

(cherry picked from commit 3ae448b592)

b870ae08 Fix `Activity.all_by_actor_and_id/2` test
This commit is contained in:
rinpatch 2019-09-14 12:36:08 +00:00
parent e71d662d3a
commit c64ab84e6a

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