diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
| commit | 5469fb9561bb886deb8434e545dfb711eb20f341 (patch) | |
| tree | 78ab675afd6169e2497b5c47882725cc1d2f2326 /test/web/twitter_api/representers | |
| parent | c06a5af386a3cdfeda0b2c21963d9200fb7d6c89 (diff) | |
| parent | d93789dfde3c44c76a56732088a897ddddfe9716 (diff) | |
| download | pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.tar.gz pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
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, %{ |