X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Ffeed_representer_test.exs;h=bf3feb14e451aef470477f080739894cc82296ee;hb=0a6c897c9488b26273a5fbb2de1ae1bfa0c96675;hp=a5f28f6d5cd54d356c4860ae2bf945c782a7af60;hpb=04fb4f9c47b273256d628eefa5bd8af77cca31fb;p=akkoma

diff --git a/test/web/ostatus/feed_representer_test.exs b/test/web/ostatus/feed_representer_test.exs
index a5f28f6d5..bf3feb14e 100644
--- a/test/web/ostatus/feed_representer_test.exs
+++ b/test/web/ostatus/feed_representer_test.exs
@@ -11,31 +11,39 @@ defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
 
     tuple = FeedRepresenter.to_simple_form(user, [note_activity], [user])
 
-    most_recent_update = note_activity.updated_at
-    |> NaiveDateTime.to_iso8601
+    most_recent_update =
+      note_activity.updated_at
+      |> NaiveDateTime.to_iso8601()
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
-    user_xml = UserRepresenter.to_simple_form(user)
-    |> :xmerl.export_simple_content(:xmerl_xml)
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> to_string
 
-    entry_xml = ActivityRepresenter.to_simple_form(note_activity, user)
-    |> :xmerl.export_simple_content(:xmerl_xml)
+    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/" xmlns:poco="http://portablecontacts.net/spec/1.0">
+    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" 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>
+      <logo>#{User.avatar_url(user)}</logo>
       <link rel="hub" href="#{OStatus.pubsub_path(user)}" />
-      <link rel="self" href="#{OStatus.feed_path(user)}" />
+      <link rel="salmon" href="#{OStatus.salmon_path(user)}" />
+      <link rel="self" href="#{OStatus.feed_path(user)}" type="application/atom+xml" />
       <author>
         #{user_xml}
       </author>
+      <link rel="next" href="#{OStatus.feed_path(user)}?max_id=#{note_activity.id}" type="application/atom+xml" />
       <entry>
         #{entry_xml}
       </entry>
     </feed>
     """
+
     assert clean(res) == clean(expected)
   end