[#468] Merged `upstream/develop`, resolved conflicts.

[akkoma] / test / web / ostatus / incoming_documents / delete_handling_test.exs

diff --git a/test/web/ostatus/incoming_documents/delete_handling_test.exs b/test/web/ostatus/incoming_documents/delete_handling_test.exs
index 74c6a5994711763cd7cbe86d218ff38450f8acaa..d295cc539f9d194a29ab66965c107a83e2943919 100644 (file)
--- a/test/web/ostatus/incoming_documents/delete_handling_test.exs
+++ b/test/web/ostatus/incoming_documents/delete_handling_test.exs
@@ -2,9 +2,18 @@ defmodule Pleroma.Web.OStatus.DeleteHandlingTest do
   use Pleroma.DataCase
 
   import Pleroma.Factory
-  alias Pleroma.{Repo, Activity, Object}
+  import Tesla.Mock
+
+  alias Pleroma.Repo
+  alias Pleroma.Activity
+  alias Pleroma.Object
   alias Pleroma.Web.OStatus
 
+  setup do
+    mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
+
   describe "deletions" do
     test "it removes the mentioned activity" do
       note = insert(:note_activity)
@@ -12,15 +21,20 @@ defmodule Pleroma.Web.OStatus.DeleteHandlingTest do
       user = insert(:user)
       object = Object.get_by_ap_id(note.data["object"]["id"])
 
-      {:ok, like, object} = Pleroma.Web.ActivityPub.ActivityPub.like(user, object)
+      {:ok, like, _object} = Pleroma.Web.ActivityPub.ActivityPub.like(user, object)
+
+      incoming =
+        File.read!("test/fixtures/delete.xml")
+        |> String.replace(
+          "tag:mastodon.sdf.org,2017-06-10:objectId=310513:objectType=Status",
+          note.data["object"]["id"]
+        )
 
-      incoming = File.read!("test/fixtures/delete.xml")
-      |> String.replace("tag:mastodon.sdf.org,2017-06-10:objectId=310513:objectType=Status", note.data["object"]["id"])
       {:ok, [delete]} = OStatus.handle_incoming(incoming)
 
       refute Repo.get(Activity, note.id)
       refute Repo.get(Activity, like.id)
-      refute Object.get_by_ap_id(note.data["object"]["id"])
+      assert Object.get_by_ap_id(note.data["object"]["id"]).data["type"] == "Tombstone"
       assert Repo.get(Activity, second_note.id)
       assert Object.get_by_ap_id(second_note.data["object"]["id"])