diff options
| author | lain <lain@soykaf.club> | 2020-03-20 14:52:58 +0100 | 
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-20 14:52:58 +0100 | 
| commit | 1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2 (patch) | |
| tree | f69f8dbf3a012bab253fe267daf967616eefcc0a /test/web/activity_pub | |
| parent | 9b9d67bbec537df6f7c5729e81da6deeaf896bd9 (diff) | |
| parent | d63dca8d99196c91dc3e20e2d27f61ea753b84af (diff) | |
| download | pleroma-1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2.tar.gz pleroma-1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/activity_pub_test.exs | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index d5dd44cc3..2ea03bbf9 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -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 | 
