diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-14 12:36:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-14 18:14:39 +0000 |
| commit | c64ab84e6a4aef18d4d38d11d445777be09f8e00 (patch) | |
| tree | 8f722d63536585b3192b63cf6bf843ccf8b21f6c | |
| parent | e71d662d3a7d8166ca2ccc32b36ea7ba666dcf19 (diff) | |
| download | pleroma-c64ab84e6a4aef18d4d38d11d445777be09f8e00.tar.gz | |
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 3ae448b592214b43af1d079c997c6f6b91d31aeb)
b870ae08 Fix `Activity.all_by_actor_and_id/2` test
| -rw-r--r-- | test/activity_test.exs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/activity_test.exs b/test/activity_test.exs index f9f789a76..275cab81e 100644 --- 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 |