diff options
| author | lambda <lain@soykaf.club> | 2019-05-16 13:44:22 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-16 13:44:22 +0000 |
| commit | fde30aee43edd50a40dd4bfdc0008f5395dfc751 (patch) | |
| tree | f66947d0d59680dd3166c0bf8ea9ae39775977ef /test | |
| parent | 103f205097e73dd5bcc1b302e0d27a180c4b0e15 (diff) | |
| parent | f3971cbde3d69faec973717e1421f4a643ef947e (diff) | |
| download | pleroma-fde30aee43edd50a40dd4bfdc0008f5395dfc751.tar.gz | |
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
Diffstat (limited to 'test')
| -rw-r--r-- | test/user_test.exs | 2 | ||||
| -rw-r--r-- | test/web/activity_pub/activity_pub_test.exs | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index f256396c0..16a014f2f 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -873,7 +873,6 @@ defmodule Pleroma.UserTest do assert [activity] == ActivityPub.fetch_activities([user2.ap_id | user2.following], %{"user" => user2}) - |> ActivityPub.contain_timeline(user2) {:ok, _user} = User.deactivate(user) @@ -882,7 +881,6 @@ defmodule Pleroma.UserTest do assert [] == ActivityPub.fetch_activities([user2.ap_id | user2.following], %{"user" => user2}) - |> ActivityPub.contain_timeline(user2) end end diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 0f90aa1ac..34e23b852 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -960,17 +960,21 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do "in_reply_to_status_id" => private_activity_2.id }) - activities = ActivityPub.fetch_activities([user1.ap_id | user1.following]) + activities = + ActivityPub.fetch_activities([user1.ap_id | user1.following]) + |> Enum.map(fn a -> a.id end) private_activity_1 = Activity.get_by_ap_id_with_object(private_activity_1.data["id"]) - assert [public_activity, private_activity_1, private_activity_3] == activities + assert [public_activity.id, private_activity_1.id, private_activity_3.id] == activities assert length(activities) == 3 - activities = ActivityPub.contain_timeline(activities, user1) + activities = + ActivityPub.fetch_activities([user1.ap_id | user1.following], %{"user" => user1}) + |> Enum.map(fn a -> a.id end) - assert [public_activity, private_activity_1] == activities + assert [public_activity.id, private_activity_1.id] == activities assert length(activities) == 2 end end |