Merge branch 'fix/user-timeline-reading-user' into 'develop'

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

diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index e4cff898d6da699b103ef869da969a5634c10ce5..38484409560e15184b37246f112ae561669b7bb3 100644 (file)
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -8,8 +8,6 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
   alias Pleroma.User
   alias Pleroma.Repo
   alias Pleroma.Web.Websub.WebsubClientSubscription
-  alias Pleroma.Web.Websub.WebsubServerSubscription
-  import Ecto.Query
 
   import Pleroma.Factory
   alias Pleroma.Web.CommonAPI
@@ -284,7 +282,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
         |> Map.put("object", object)
         |> Map.put("actor", activity.data["actor"])
 
-      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
+      {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
 
       refute Repo.get(Activity, activity.id)
     end
@@ -401,10 +399,17 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
         |> Poison.decode!()
         |> Map.put("actor", followed.ap_id)
 
-      accept_data =
-        Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
+      object =
+        accept_data["object"]
+        |> Map.put("actor", follower.ap_id)
+        |> Map.put("id", follow_activity.data["id"])
 
-      {:ok, %Activity{data: _}} = Transmogrifier.handle_incoming(accept_data)
+      accept_data = Map.put(accept_data, "object", object)
+
+      {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
+      refute activity.local
+
+      assert activity.data["object"] == follow_activity.data["id"]
 
       follower = Repo.get(User, follower.id)
 
@@ -425,7 +430,8 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       accept_data =
         Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
 
-      {:ok, %Activity{data: _}} = Transmogrifier.handle_incoming(accept_data)
+      {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
+      assert activity.data["object"] == follow_activity.data["id"]
 
       follower = Repo.get(User, follower.id)
 
@@ -444,7 +450,8 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
         |> Map.put("actor", followed.ap_id)
         |> Map.put("object", follow_activity.data["id"])
 
-      {:ok, %Activity{data: _}} = Transmogrifier.handle_incoming(accept_data)
+      {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
+      assert activity.data["object"] == follow_activity.data["id"]
 
       follower = Repo.get(User, follower.id)
 
@@ -470,12 +477,31 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       refute User.following?(follower, followed) == true
     end
 
+    test "it fails for incoming rejects which cannot be correlated" do
+      follower = insert(:user)
+      followed = insert(:user, %{info: %{"locked" => true}})
+
+      accept_data =
+        File.read!("test/fixtures/mastodon-reject-activity.json")
+        |> Poison.decode!()
+        |> Map.put("actor", followed.ap_id)
+
+      accept_data =
+        Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
+
+      :error = Transmogrifier.handle_incoming(accept_data)
+
+      follower = Repo.get(User, follower.id)
+
+      refute User.following?(follower, followed) == true
+    end
+
     test "it works for incoming rejects which are orphaned" do
       follower = insert(:user)
       followed = insert(:user, %{info: %{"locked" => true}})
 
       {:ok, follower} = User.follow(follower, followed)
-      {:ok, follow_activity} = ActivityPub.follow(follower, followed)
+      {:ok, _follow_activity} = ActivityPub.follow(follower, followed)
 
       assert User.following?(follower, followed) == true
 
@@ -487,7 +513,8 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       reject_data =
         Map.put(reject_data, "object", Map.put(reject_data["object"], "actor", follower.ap_id))
 
-      {:ok, %Activity{data: _}} = Transmogrifier.handle_incoming(reject_data)
+      {:ok, activity} = Transmogrifier.handle_incoming(reject_data)
+      refute activity.local
 
       follower = Repo.get(User, follower.id)