Also fetch atom links.

[akkoma] / test / web / ostatus / activity_representer_test.exs

diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index ec75fc7652e9bf44e25474b390e7c4c540b855a5..0129e375855625fb72ffd668823a50cf3837167e 100644 (file)
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -4,9 +4,23 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   alias Pleroma.Web.OStatus.ActivityRepresenter
   alias Pleroma.{User, Activity, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.OStatus
 
   import Pleroma.Factory
 
+  test "an external note activity" do
+    incoming = File.read!("test/fixtures/mastodon-note-cw.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    user = User.get_cached_by_ap_id(activity.data["actor"])
+
+    tuple = ActivityRepresenter.to_simple_form(activity, user)
+
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+
+    assert String.contains?(res, ~s{<link type="text/html" href="https://mastodon.social/users/lambadalambda/updates/2314748" rel="alternate"/>})
+  end
+
   test "a note activity" do
     note_activity = insert(:note_activity)
 
@@ -18,11 +32,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <id>#{note_activity.data["object"]["id"]}</id>
     <title>New note by #{user.nickname}</title>
     <content type="html">#{note_activity.data["object"]["content"]}</content>
-    <published>#{note_activity.data["published"]}</published>
-    <updated>#{note_activity.data["published"]}</updated>
+    <published>#{note_activity.data["object"]["published"]}</published>
+    <updated>#{note_activity.data["object"]["published"]}</updated>
     <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
     <link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" />
     <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" />
+    <link type="text/html" href="#{note_activity.data["object"]["id"]}" rel="alternate" />
     <category term="2hu"/>
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
@@ -43,6 +58,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     data = %{answer.data | "object" => object}
     answer = %{answer | data: data}
 
+    note_object = Object.get_by_ap_id(note.data["object"]["id"])
+    Repo.update!(Object.change(note_object, %{ data: Map.put(note_object.data, "external_url", "someurl") }))
+
     user = User.get_cached_by_ap_id(answer.data["actor"])
 
     expected = """
@@ -51,13 +69,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <id>#{answer.data["object"]["id"]}</id>
     <title>New note by #{user.nickname}</title>
     <content type="html">#{answer.data["object"]["content"]}</content>
-    <published>#{answer.data["published"]}</published>
-    <updated>#{answer.data["published"]}</updated>
+    <published>#{answer.data["object"]["published"]}</published>
+    <updated>#{answer.data["object"]["published"]}</updated>
     <ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
     <link ref="#{answer.data["context"]}" rel="ostatus:conversation" />
     <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" />
+    <link type="text/html" href="#{answer.data["object"]["id"]}" rel="alternate" />
     <category term="2hu"/>
-    <thr:in-reply-to ref="#{note.data["object"]["id"]}" />
+    <thr:in-reply-to ref="#{note.data["object"]["id"]}" href="someurl" />
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """