summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/representers
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-13 17:15:02 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-13 17:15:02 +0300
commit443381d0a05849d7dcdc0abb11844cb4d4a75a55 (patch)
tree48d66563e0156a22e6fe91ab99350e571c8d482c /test/web/twitter_api/representers
parenta7e74ee01232897a6172f6462cec282a451c319a (diff)
parentd2bf099ae66b7332128c854f322bb8a00eb62212 (diff)
downloadpleroma-443381d0a05849d7dcdc0abb11844cb4d4a75a55.tar.gz
pleroma-443381d0a05849d7dcdc0abb11844cb4d4a75a55.zip
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
Diffstat (limited to 'test/web/twitter_api/representers')
-rw-r--r--test/web/twitter_api/representers/activity_representer_test.exs11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index 256d920c0..f1f2b4c9c 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -23,8 +23,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
}
}
- content = "Some content mentioning @shp"
- date = DateTime.utc_now() |> DateTime.to_iso8601
+ content_html = "Some content mentioning <a href='shp'>@shp</shp>"
+ content = HtmlSanitizeEx.strip_tags(content_html)
+ date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
activity = %Activity{
id: 1,
@@ -39,7 +40,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"object" => %{
"published" => date,
"type" => "Note",
- "content" => content,
+ "content" => content_html,
"inReplyToStatusId" => 213123,
"statusnetConversationId" => 4711,
"attachment" => [
@@ -56,10 +57,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"user" => UserRepresenter.to_map(user, %{for: follower}),
"is_local" => true,
"attentions" => [],
- "statusnet_html" => content,
+ "statusnet_html" => content_html,
"text" => content,
"is_post_verb" => true,
- "created_at" => date,
+ "created_at" => "Tue May 24 13:26:08 +0000 2016",
"in_reply_to_status_id" => 213123,
"statusnet_conversation_id" => 4711,
"attachments" => [