Resolve conflicts

[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 26e8d60fecf72eb6574c1684fa40bc9890fa07bf..68ec03c339616b5a4d2730c0194ca0c0fa2563ba 100644 (file)
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -15,6 +15,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
   alias Pleroma.Web.Websub.WebsubClientSubscription
 
   import Pleroma.Factory
+  import ExUnit.CaptureLog
   alias Pleroma.Web.CommonAPI
 
   setup_all do
@@ -67,13 +68,15 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
 
       object =
         data["object"]
-        |> Map.put("inReplyTo", "https://nonexistent.space/whatever")
+        |> Map.put("inReplyTo", "https://404.site/whatever")
 
       data =
         data
         |> Map.put("object", object)
 
-      {:ok, _returned_activity} = Transmogrifier.handle_incoming(data)
+      assert capture_log(fn ->
+               {:ok, _returned_activity} = Transmogrifier.handle_incoming(data)
+             end) =~ "[error] Couldn't fetch \"\"https://404.site/whatever\"\", error: nil"
     end
 
     test "it works for incoming notices" do
@@ -516,7 +519,10 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
         data
         |> Map.put("object", object)
 
-      :error = Transmogrifier.handle_incoming(data)
+      assert capture_log(fn ->
+               :error = Transmogrifier.handle_incoming(data)
+             end) =~
+               "[error] Could not decode user at fetch http://mastodon.example.org/users/gargron, {:error, {:error, :nxdomain}}"
 
       assert Activity.get_by_id(activity.id)
     end