diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
| commit | c48c381e909240dcece9f961e4728fa712d089cc (patch) | |
| tree | 6aa2a1edbfe5d15860ab5090c645bc9ba312ab96 /test/web/ostatus/feed_representer_test.exs | |
| parent | 6cf7c132282e612514af992c6dea0b03ee5b678d (diff) | |
| parent | c85998ab8a21f042ab57345a7baa9e1e27c308d1 (diff) | |
| download | pleroma-c48c381e909240dcece9f961e4728fa712d089cc.tar.gz pleroma-c48c381e909240dcece9f961e4728fa712d089cc.zip | |
Merge branch 'develop' into dtluna/pleroma-refactor/1
Diffstat (limited to 'test/web/ostatus/feed_representer_test.exs')
| -rw-r--r-- | test/web/ostatus/feed_representer_test.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/web/ostatus/feed_representer_test.exs b/test/web/ostatus/feed_representer_test.exs index 9a02d8c16..df5a964e2 100644 --- a/test/web/ostatus/feed_representer_test.exs +++ b/test/web/ostatus/feed_representer_test.exs @@ -22,12 +22,13 @@ defmodule Pleroma.Web.OStatus.FeedRepresenterTest do |> :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> <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> |