summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/representers
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-12-09 11:00:56 +0100
committerRoger Braun <roger@rogerbraun.net>2017-12-09 11:00:56 +0100
commit30e9b22f96f2bf1cd895e993190f40afba159bb6 (patch)
tree811c64694f98c10f55cdbaeb98ada50209b59580 /test/web/twitter_api/representers
parent6268b7e0eb400c1b5e227a73e6faee0f1e476db4 (diff)
parentd5a13c10ac6a9a5f8dbb1932ffc85260f079a2dc (diff)
downloadpleroma-30e9b22f96f2bf1cd895e993190f40afba159bb6.tar.gz
pleroma-30e9b22f96f2bf1cd895e993190f40afba159bb6.zip
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'test/web/twitter_api/representers')
-rw-r--r--test/web/twitter_api/representers/activity_representer_test.exs5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index f08644611..7e2ea630c 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -91,6 +91,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"published" => date,
"type" => "Note",
"content" => content_html,
+ "summary" => "2hu",
"inReplyToStatusId" => 213123,
"attachment" => [
object
@@ -110,14 +111,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
local: false
}
- expected_html = "alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
+ expected_html = "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
expected_status = %{
"id" => activity.id,
"user" => UserView.render("show.json", %{user: user, for: follower}),
"is_local" => false,
"statusnet_html" => expected_html,
- "text" => content,
+ "text" => "2hu" <> content,
"is_post_verb" => true,
"created_at" => "Tue May 24 13:26:08 +0000 2016",
"in_reply_to_status_id" => 213123,