diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
| commit | f2fa09c50fde8db4e619872ef6121e90a69324a6 (patch) | |
| tree | 4d34037c5fc6d1a3c05a0b061f5279caef1bd671 /test/web/twitter_api/representers | |
| parent | 718882b326f00c8315bca5acc439b92aa37bf021 (diff) | |
| parent | 5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e (diff) | |
| download | pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.tar.gz pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.zip | |
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
Diffstat (limited to 'test/web/twitter_api/representers')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 5 |
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 16c6e7b0d..3f85e028b 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -126,7 +126,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do } 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=\"#{ + "<p>2hu</p>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>" @@ -155,7 +155,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "activity_type" => "post", "possibly_sensitive" => true, "uri" => activity.data["object"]["id"], - "visibility" => "direct" + "visibility" => "direct", + "summary" => "2hu" } assert ActivityRepresenter.to_map(activity, %{ |