pleroma

commit: 6c3f5e8ba0b164ef50e0c7bf0fe36223f821b680
parent e71d662d3a7d8166ca2ccc32b36ea7ba666dcf19
Author: rinpatch <rinpatch@sdf.org>
Date:   Sat, 14 Sep 2019 18:14:54 +0000

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

Backport a test fix to 1.1

See merge request pleroma/pleroma!1671
Diffstat:
M
test/activity_test.exs
8
++++++--

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