Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature...

[akkoma] / test / web / activity_pub / activity_pub_test.exs

diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 208cc42d2a094edfa749769ccb055b954d296b57..7735e1bf8334f263f1c49c1cac4155b4daf27697 100644 (file)
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -83,16 +83,18 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
 
   describe "create activities" do
     test "removes doubled 'to' recipients" do
+      user = insert(:user)
+
       {:ok, activity} =
         ActivityPub.create(%{
           to: ["user1", "user1", "user2"],
-          actor: %User{ap_id: "1"},
+          actor: user,
           context: "",
           object: %{}
         })
 
       assert activity.data["to"] == ["user1", "user2"]
-      assert activity.actor == "1"
+      assert activity.actor == user.ap_id
       assert activity.recipients == ["user1", "user2"]
     end
   end
@@ -278,8 +280,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       user = insert(:user)
 
       # Unannouncing an object that is not announced does nothing
-      #{:ok, object} = ActivityPub.unannounce(user, object)
-      #assert object.data["announcement_count"] == 0
+      # {:ok, object} = ActivityPub.unannounce(user, object)
+      # assert object.data["announcement_count"] == 0
 
       {:ok, announce_activity, object} = ActivityPub.announce(user, object)
       assert object.data["announcement_count"] == 1
@@ -293,6 +295,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
                User.ap_followers(user),
                announce_activity.data["actor"]
              ]
+      
       assert unannounce_activity.data["type"] == "Undo"
       assert unannounce_activity.data["object"] == announce_activity.data
       assert unannounce_activity.data["actor"] == user.ap_id