Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity

This commit is contained in:
Haelwenn (lanodan) Monnier 2020-03-19 19:25:50 +01:00
commit a8aa917530
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
15 changed files with 72 additions and 96 deletions

View file

@ -1955,11 +1955,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
activity = %Activity{activity | object: nil}
assert [%Notification{activity: ^activity}] =
Notification.for_user(follower, %{with_move: true})
assert [%Notification{activity: ^activity}] = Notification.for_user(follower)
assert [%Notification{activity: ^activity}] =
Notification.for_user(follower_move_opted_out, %{with_move: true})
assert [%Notification{activity: ^activity}] = Notification.for_user(follower_move_opted_out)
end
test "old user must be in the new user's `also_known_as` list" do