summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/representers/activity_representer_test.exs
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-13 15:18:18 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-13 15:18:18 +0300
commit3ff917b5dd72bc44f84a8f08cfc368faf28199f0 (patch)
tree2bb558af2ee2a8b4ad23211f8f3ad5d7ca8a5421 /test/web/twitter_api/representers/activity_representer_test.exs
parent896e40cd2bbd064548a1a9cb730f79d793e6d6f5 (diff)
parentd2bf099ae66b7332128c854f322bb8a00eb62212 (diff)
downloadpleroma-3ff917b5dd72bc44f84a8f08cfc368faf28199f0.tar.gz
pleroma-3ff917b5dd72bc44f84a8f08cfc368faf28199f0.zip
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
Diffstat (limited to 'test/web/twitter_api/representers/activity_representer_test.exs')
-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" => [