X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Ffeed_representer_test.exs;h=ef0f4d5fffe3a50ff27e79afdd477b3893c9b30c;hb=b91ccef2371fb0bbc23638b174e815dd7189482e;hp=e252eca9f7cd63ed8791d44667f6b3f76d017b50;hpb=d23f3e3cf3c9a0051532493c60dbd9a7557bae81;p=akkoma

diff --git a/test/web/ostatus/feed_representer_test.exs b/test/web/ostatus/feed_representer_test.exs
index e252eca9f..ef0f4d5ff 100644
--- a/test/web/ostatus/feed_representer_test.exs
+++ b/test/web/ostatus/feed_representer_test.exs
@@ -2,7 +2,7 @@ defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
   use Pleroma.DataCase
   import Pleroma.Factory
   alias Pleroma.User
-  alias Pleroma.Web.OStatus.{FeedRepresenter, UserRepresenter}
+  alias Pleroma.Web.OStatus.{FeedRepresenter, UserRepresenter, ActivityRepresenter}
   alias Pleroma.Web.OStatus
 
   test "returns a feed of the last 20 items of the user" do
@@ -14,20 +14,27 @@ defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
     most_recent_update = note_activity.updated_at
     |> NaiveDateTime.to_iso8601
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> to_string
     user_xml = UserRepresenter.to_simple_form(user)
     |> :xmerl.export_simple_content(:xmerl_xml)
 
+    entry_xml = ActivityRepresenter.to_simple_form(note_activity, user)
+    |> :xmerl.export_simple_content(:xmerl_xml)
+
     expected = """
-    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/">
+    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0">
       <id>#{OStatus.feed_path(user)}</id>
       <title>#{user.nickname}'s timeline</title>
       <updated>#{most_recent_update}</updated>
-      <entries />
-      <link rel="hub" href="#{OStatus.pubsub_path}" />
+      <link rel="hub" href="#{OStatus.pubsub_path(user)}" />
+      <link rel="salmon" href="#{OStatus.salmon_path(user)}" />
+      <link rel="self" href="#{OStatus.feed_path(user)}" />
       <author>
         #{user_xml}
       </author>
+      <entry>
+        #{entry_xml}
+      </entry>
     </feed>
     """
     assert clean(res) == clean(expected)