diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-04-26 08:47:22 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-04-26 08:47:22 +0200 |
| commit | b91ccef2371fb0bbc23638b174e815dd7189482e (patch) | |
| tree | 65b65b97c5dbbf927dbb33f5adbf22d9f479f026 /test | |
| parent | f980f6778b1447b808299fa9274854bb25f9823b (diff) | |
| download | pleroma-b91ccef2371fb0bbc23638b174e815dd7189482e.tar.gz | |
Output conversation id.
Diffstat (limited to 'test')
| -rw-r--r-- | test/support/factory.ex | 6 | ||||
| -rw-r--r-- | test/web/ostatus/activity_representer_test.exs | 2 | ||||
| -rw-r--r-- | test/web/ostatus/feed_representer_test.exs | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/test/support/factory.ex b/test/support/factory.ex index d7c16f0e0..d037be4a6 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -24,7 +24,8 @@ defmodule Pleroma.Factory do "to" => ["https://www.w3.org/ns/activitystreams#Public"], "published_at" => DateTime.utc_now() |> DateTime.to_iso8601, "likes" => [], - "like_count" => 0 + "like_count" => 0, + "context" => "2hu" } %Pleroma.Object{ @@ -40,7 +41,8 @@ defmodule Pleroma.Factory do "actor" => note.data["actor"], "to" => note.data["to"], "object" => note.data, - "published_at" => DateTime.utc_now() |> DateTime.to_iso8601 + "published_at" => DateTime.utc_now() |> DateTime.to_iso8601, + "context" => note.data["context"] } %Pleroma.Activity{ 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> |