2 files changed, 7 insertions, 6 deletions
diff --git a/test/fixtures/mastodon-unblock-activity.json b/test/fixtures/mastodon-unblock-activity.json
index 53b2f42a8..f4a2d30dd 100644
--- a/test/fixtures/mastodon-unblock-activity.json
+++ b/test/fixtures/mastodon-unblock-activity.json
@@ -26,8 +26,9 @@
       "type": "Block", 
       "object": "http://localtesting.pleroma.lol/users/lain",
       "nickname": "lain",
-      "id": "http://mastodon.example.org/users/admin#follows/2",
+      "id": "http://mastodon.example.org/users/admin#blocks/2",
       "actor": "http://mastodon.example.org/users/admin" 
     },
-    "actor": "http://mastodon.example.org/users/admin"
+    "actor": "http://mastodon.example.org/users/admin",
+    "id": "http://mastodon.example.org/users/admin#blocks/2/undo"
 }
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index da55909bc..cf6b1d0b5 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -316,7 +316,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
                "http://mastodon.example.org/users/admin/statuses/99542391527669785/activity"
     end
 
-    test "it works for incomming unfollows" do
+    test "it works for incomming unfollows with an existing follow" do
       user = insert(:user)
 
       follow_data =
@@ -360,7 +360,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       assert User.blocks?(blocker, user)
     end
 
-    test "it works for incoming unblocks" do
+    test "it works for incoming unblocks with an existing block" do
       user = insert(:user)
 
       block_data =
@@ -379,11 +379,11 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       assert data["type"] == "Undo"
       assert data["object"]["type"] == "Block"
       assert data["object"]["object"] == user.ap_id
-      assert data["actor"] == "https://mastodon.example.org/users/admin"
+      assert data["actor"] == "http://mastodon.example.org/users/admin"
 
       blocker = User.get_by_ap_id(data["actor"])
 
-      refute User.blocks?(blocker, user.ap_id)
+      refute User.blocks?(blocker, user)
     end
   end