Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch

[akkoma] / test / pleroma / notification_test.exs

diff --git a/test/pleroma/notification_test.exs b/test/pleroma/notification_test.exs
index 0d2cacb57a6c465ff930b08f7f0b023d584c560e..716af496d8074a6e1dd25098c7e8c03fdfd18cfb 100644 (file)
--- a/test/pleroma/notification_test.exs
+++ b/test/pleroma/notification_test.exs
@@ -139,7 +139,7 @@ defmodule Pleroma.NotificationTest do
 
     {:ok, notifications} = Notification.create_poll_notifications(activity)
 
-    assert [user1.id, user3.id, user2.id] == Enum.map(notifications, & &1.user_id)
+    assert [user2.id, user3.id, user1.id] == Enum.map(notifications, & &1.user_id)
   end
 
   describe "CommonApi.post/2 notification-related functionality" do
@@ -637,6 +637,8 @@ defmodule Pleroma.NotificationTest do
         "actor" => user.ap_id,
         "object" => %{
           "type" => "Note",
+          "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
+          "to" => ["https://www.w3.org/ns/activitystreams#Public"],
           "content" => "message with a Mention tag, but no explicit tagging",
           "tag" => [
             %{
@@ -668,6 +670,9 @@ defmodule Pleroma.NotificationTest do
         "actor" => user.ap_id,
         "object" => %{
           "type" => "Note",
+          "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
+          "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+          "cc" => [other_user.ap_id],
           "content" => "hi everyone",
           "attributedTo" => user.ap_id
         }
@@ -964,6 +969,7 @@ defmodule Pleroma.NotificationTest do
         "cc" => [],
         "object" => %{
           "type" => "Note",
+          "id" => remote_user.ap_id <> "/objects/test",
           "content" => "Hello!",
           "tag" => [
             %{