Merge branch 'chore/fix-ap-muted-tests' into 'develop'

tests: activitypub: fix muted thread tests

See merge request pleroma/pleroma!1584
This commit is contained in:
kaniini 2019-08-18 22:33:51 +00:00
commit 608773c5ef

View file

@ -540,24 +540,24 @@ test "doesn't return muted activities" do
test "doesn't return thread muted activities" do test "doesn't return thread muted activities" do
user = insert(:user) user = insert(:user)
activity_one = insert(:note_activity) _activity_one = insert(:note_activity)
note_two = insert(:note, data: %{"context" => "suya.."}) note_two = insert(:note, data: %{"context" => "suya.."})
activity_two = insert(:note_activity, note: note_two) activity_two = insert(:note_activity, note: note_two)
{:ok, _activity_two} = CommonAPI.add_mute(user, activity_two) {:ok, _activity_two} = CommonAPI.add_mute(user, activity_two)
assert [activity_one] = ActivityPub.fetch_activities([], %{"muting_user" => user}) assert [_activity_one] = ActivityPub.fetch_activities([], %{"muting_user" => user})
end end
test "returns thread muted activities when with_muted is set" do test "returns thread muted activities when with_muted is set" do
user = insert(:user) user = insert(:user)
activity_one = insert(:note_activity) _activity_one = insert(:note_activity)
note_two = insert(:note, data: %{"context" => "suya.."}) note_two = insert(:note, data: %{"context" => "suya.."})
activity_two = insert(:note_activity, note: note_two) activity_two = insert(:note_activity, note: note_two)
{:ok, activity_two} = CommonAPI.add_mute(user, activity_two) {:ok, activity_two} = CommonAPI.add_mute(user, activity_two)
assert [activity_two, activity_one] = assert [_activity_two, _activity_one] =
ActivityPub.fetch_activities([], %{"muting_user" => user, "with_muted" => true}) ActivityPub.fetch_activities([], %{"muting_user" => user, "with_muted" => true})
end end