diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-28 10:22:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-28 10:22:19 +0000 |
| commit | cf426a719dfe26a11b0bf0a22a08fd45ca5b9dc2 (patch) | |
| tree | 8a763742b6a7cef37fdcc7dfc3f12a17490b2dc8 /test/web/activity_pub | |
| parent | 90a24fbf950f9da80ff30259a9d54317a9d2662e (diff) | |
| parent | bbbdbec4fd8f14aa039d7f4a42215544cd6e4932 (diff) | |
| download | pleroma-cf426a719dfe26a11b0bf0a22a08fd45ca5b9dc2.tar.gz pleroma-cf426a719dfe26a11b0bf0a22a08fd45ca5b9dc2.zip | |
Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/activity_pub_test.exs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 11262c523..ac3a565de 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -291,6 +291,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do assert Enum.member?(activities, activity_three) refute Enum.member?(activities, activity_one) + # Calling with 'with_muted' will deliver muted activities, too. + activities = ActivityPub.fetch_activities([], %{"muting_user" => user, "with_muted" => true}) + + assert Enum.member?(activities, activity_two) + assert Enum.member?(activities, activity_three) + assert Enum.member?(activities, activity_one) + {:ok, user} = User.unmute(user, %User{ap_id: activity_one.data["actor"]}) activities = ActivityPub.fetch_activities([], %{"muting_user" => user}) |