diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-04-26 18:34:14 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-04-26 18:34:14 +0200 |
| commit | 7561158ab15ee7d6e1112fecb1681c2d379cb7ff (patch) | |
| tree | 9044476a41eae9f123295352e0d77b371f8afd1b /test/web/ostatus | |
| parent | c5fa682c317717c64168bf2d77b28d805ffff450 (diff) | |
| parent | e8882ab3daa754aea8b2b1a96b7532c14530bbdc (diff) | |
| download | pleroma-7561158ab15ee7d6e1112fecb1681c2d379cb7ff.tar.gz pleroma-7561158ab15ee7d6e1112fecb1681c2d379cb7ff.zip | |
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
Diffstat (limited to 'test/web/ostatus')
| -rw-r--r-- | test/web/ostatus/activity_representer_test.exs | 2 | ||||
| -rw-r--r-- | test/web/ostatus/feed_representer_test.exs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs index 61df41a1d..10f9a9d0b 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -23,6 +23,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <content type="html">#{note_activity.data["object"]["content"]}</content> <published>#{inserted_at}</published> <updated>#{updated_at}</updated> + <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation> + <link href="#{note_activity.data["context"]}" rel="ostatus:conversation" /> """ tuple = ActivityRepresenter.to_simple_form(note_activity, user) diff --git a/test/web/ostatus/feed_representer_test.exs b/test/web/ostatus/feed_representer_test.exs index 13cdeb79d..ef0f4d5ff 100644 --- a/test/web/ostatus/feed_representer_test.exs +++ b/test/web/ostatus/feed_representer_test.exs @@ -22,7 +22,7 @@ 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: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> |