diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-15 10:12:24 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-15 10:12:24 +0300 |
| commit | 610236d6be1916783976f502255835b411337d79 (patch) | |
| tree | 16f79d48ab22ab6faabfd8917126716ce261db1e /test/activity_test.exs | |
| parent | e127b9ab6d01da48ebad188d2b9fcf7cb8a41578 (diff) | |
| parent | 9c64a25713790fefa8b5c419aeadf55113c17073 (diff) | |
| download | pleroma-610236d6be1916783976f502255835b411337d79.tar.gz pleroma-610236d6be1916783976f502255835b411337d79.zip | |
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
Diffstat (limited to 'test/activity_test.exs')
| -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 f8aac4e52..6512d84ac 100644 --- a/test/activity_test.exs +++ b/test/activity_test.exs @@ -215,7 +215,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 |