projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
[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 dddc63ebfbdc833b22089588647cf686ffeb81c6..3c7b126e74afda7b2d64be7b673793812c3d8d0a 100644
(file)
--- a/
test/web/ostatus/feed_representer_test.exs
+++ b/
test/web/ostatus/feed_representer_test.exs
@@
-1,9
+1,15
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
use Pleroma.DataCase
import Pleroma.Factory
alias Pleroma.User
defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
use Pleroma.DataCase
import Pleroma.Factory
alias Pleroma.User
- alias Pleroma.Web.OStatus.{FeedRepresenter, UserRepresenter, ActivityRepresenter}
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus
+ alias Pleroma.Web.OStatus.ActivityRepresenter
+ alias Pleroma.Web.OStatus.FeedRepresenter
+ alias Pleroma.Web.OStatus.UserRepresenter
test "returns a feed of the last 20 items of the user" do
note_activity = insert(:note_activity)
test "returns a feed of the last 20 items of the user" do
note_activity = insert(:note_activity)
@@
-11,30
+17,39
@@
defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
tuple = FeedRepresenter.to_simple_form(user, [note_activity], [user])
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) |> to_string
- 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)
+ 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)
+ 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>
- <link rel="hub" href="#{OStatus.pubsub_path}" />
+ <logo>#{User.avatar_url(user)}</logo>
+ <link rel="hub" href="#{OStatus.pubsub_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>
<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>
"""
<entry>
#{entry_xml}
</entry>
</feed>
"""
+
assert clean(res) == clean(expected)
end
assert clean(res) == clean(expected)
end