commit: 3ae448b592214b43af1d079c997c6f6b91d31aeb
parent: 4264c4b7e5c53073c3fd586c4d535952f8e18795
Author: rinpatch <rinpatch@sdf.org>
Date: Sat, 14 Sep 2019 12:36:08 +0000
Merge branch 'fix-tests' into 'develop'
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
Diffstat:
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/activity_test.exs b/test/activity_test.exs
@@ -213,7 +213,11 @@ defmodule Pleroma.ActivityTest do
assert [] == Activity.all_by_actor_and_id(user, [])
- assert [%Activity{id: ^id2}, %Activity{id: ^id1}] =
- Activity.all_by_actor_and_id(user.ap_id, [id1, id2])
+ activities =
+ 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