X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=6344889b1a82e14fab46018e5cb3bfe5f53d2d2b;hb=62607f37dcf3ab149baa09fe144959a25322be69;hp=16a9d3b000f586c5d36c677127873d16a4111d34;hpb=5e7ceeba94c179b5ffe98d1bb1115a2e0af196e2;p=akkoma

diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 16a9d3b00..6344889b1 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -2,7 +2,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   use Pleroma.DataCase
 
   alias Pleroma.Web.OStatus.ActivityRepresenter
-  alias Pleroma.User
+  alias Pleroma.{User, Activity}
 
   import Pleroma.Factory
 
@@ -18,11 +18,13 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
     <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <id>#{note_activity.data["id"]}</id>
+    <id>#{note_activity.data["object"]["id"]}</id>
     <title>New note by #{user.nickname}</title>
     <content type="html">#{note_activity.data["object"]["content"]}</content>
     <published>#{inserted_at}</published>
     <updated>#{updated_at}</updated>
+    <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
+    <link href="#{note_activity.data["context"]}" rel="ostatus:conversation" />
     """
 
     tuple = ActivityRepresenter.to_simple_form(note_activity, user)
@@ -32,6 +34,47 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     assert clean(res) == clean(expected)
   end
 
+  test "a reply note" do
+    note = insert(:note_activity)
+    answer = insert(:note_activity)
+    object = answer.data["object"]
+    object = Map.put(object, "inReplyTo", note.data["object"]["id"])
+
+    data = %{answer.data | "object" => object}
+    answer = %{answer | data: data}
+
+    updated_at = answer.updated_at
+    |> NaiveDateTime.to_iso8601
+    inserted_at = answer.inserted_at
+    |> NaiveDateTime.to_iso8601
+
+    user = User.get_cached_by_ap_id(answer.data["actor"])
+
+    expected = """
+    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+    <id>#{answer.data["object"]["id"]}</id>
+    <title>New note by #{user.nickname}</title>
+    <content type="html">#{answer.data["object"]["content"]}</content>
+    <published>#{inserted_at}</published>
+    <updated>#{updated_at}</updated>
+    <ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
+    <link href="#{answer.data["context"]}" rel="ostatus:conversation" />
+    <thr:in-reply-to ref="#{note.data["object"]["id"]}" />
+    """
+
+    tuple = ActivityRepresenter.to_simple_form(answer, user)
+
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+
+    assert clean(res) == clean(expected)
+  end
+
+  test "an unknown activity" do
+    tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
+    assert is_nil(tuple)
+  end
+
   defp clean(string) do
     String.replace(string, ~r/\s/, "")
   end