projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make outgoing salmons work.
[akkoma]
/
test
/
web
/
ostatus
/
feed_representer_test.exs
diff --git
a/test/web/ostatus/feed_representer_test.exs
b/test/web/ostatus/feed_representer_test.exs
index e252eca9f7cd63ed8791d44667f6b3f76d017b50..7bbfae49a3a62ba5cfd9c555b8ff94fae7d89051 100644
(file)
--- 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
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
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
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)
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 = """
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:
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>
<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>
<author>
#{user_xml}
</author>
+ <entry>
+ #{entry_xml}
+ </entry>
</feed>
"""
assert clean(res) == clean(expected)
</feed>
"""
assert clean(res) == clean(expected)