Merge branch 'develop' into dtluna/pleroma-refactor/1

[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 d3c32e938eb5a9efe0e7edf5c12f57c7438d8093..12c9bbaa25d3b40718fe599968c464d8bdb7a174 100644 (file)
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -26,6 +26,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <updated>#{updated_at}</updated>
     <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
     <link href="#{note_activity.data["context"]}" rel="ostatus:conversation" />
+    <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" />
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
 
@@ -62,6 +63,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <updated>#{updated_at}</updated>
     <ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
     <link href="#{answer.data["context"]}" rel="ostatus:conversation" />
+    <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" />
     <thr:in-reply-to ref="#{note.data["object"]["id"]}" />
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
@@ -84,9 +86,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     note_user = User.get_cached_by_ap_id(note.data["actor"])
     note = Repo.get(Activity, note.id)
-    note_xml = ActivityRepresenter.to_simple_form(note, note_user)
+    note_xml = ActivityRepresenter.to_simple_form(note, note_user, true)
     |> :xmerl.export_simple_content(:xmerl_xml)
-    |> IO.iodata_to_binary
+    |> to_string
 
     updated_at = announce.updated_at
     |> NaiveDateTime.to_iso8601
@@ -94,6 +96,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     |> NaiveDateTime.to_iso8601
 
     expected = """
+    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
     <activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb>
     <id>#{announce.data["id"]}</id>
     <title>#{user.nickname} repeated a notice</title>
@@ -102,7 +105,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <updated>#{updated_at}</updated>
     <ostatus:conversation>#{announce.data["context"]}</ostatus:conversation>
     <link href="#{announce.data["context"]}" rel="ostatus:conversation" />
-    <thr:in-reply-to ref="#{note.data["object"]["id"]}" />
+    <link rel="self" type="application/atom+xml" href="#{announce.data["id"]}"/>
     <activity:object>
       #{note_xml}
     </activity:object>
@@ -111,7 +114,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     announce_xml = ActivityRepresenter.to_simple_form(announce, user)
     |> :xmerl.export_simple_content(:xmerl_xml)
-    |> IO.iodata_to_binary
+    |> to_string
 
     assert clean(expected) == clean(announce_xml)
   end
@@ -144,6 +147,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     </activity:object>
     <ostatus:conversation>#{like.data["context"]}</ostatus:conversation>
     <link href="#{like.data["context"]}" rel="ostatus:conversation" />
+    <link rel="self" type="application/atom+xml" href="#{like.data["id"]}"/>
     <thr:in-reply-to ref="#{note.data["id"]}" />
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
     """