summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-19 19:25:50 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-19 19:25:50 +0100
commita8aa91753024dbd211e5e3952f5b305debaa8b55 (patch)
tree01088f8cec46c4b437b338cb78aaaee65e5d8bc7 /test/web/activity_pub
parentc1fd4f665335ba67336bd1b2fab2d9df5e247e08 (diff)
parent952cb589f47972bba8f9b94b2935a60f05e21bd3 (diff)
downloadpleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.tar.gz
pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.zip
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
Diffstat (limited to 'test/web/activity_pub')
-rw-r--r--test/web/activity_pub/activity_pub_test.exs6
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 3dd3dd04d..d86c8260e 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