diff options
| author | rinpatch <rinpatch@sdf.org> | 2018-12-01 18:12:27 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2018-12-01 18:12:27 +0300 |
| commit | fe2759bc9f2dad044b49f4954693ac09f9368041 (patch) | |
| tree | 59dd9c5026f433d976defa303de0d6782d435d1e /test/web/twitter_api/representers/activity_representer_test.exs | |
| parent | ba6e3eba33f16bdd2fede086d5fb5c86201cb57b (diff) | |
| parent | 8c3ff06e35e11a40cf4eb35a41a2019b7496e62c (diff) | |
| download | pleroma-fe2759bc9f2dad044b49f4954693ac09f9368041.tar.gz pleroma-fe2759bc9f2dad044b49f4954693ac09f9368041.zip | |
Attempt to resolve merge conflict
Diffstat (limited to 'test/web/twitter_api/representers/activity_representer_test.exs')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index 3f85e028b..291fd5237 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 = - "<p>2hu</p>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>" @@ -139,6 +139,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "is_post_verb" => true, "created_at" => "Tue May 24 13:26:08 +0000 2016", "in_reply_to_status_id" => 213_123, + "in_reply_to_screen_name" => nil, + "in_reply_to_user_id" => nil, + "in_reply_to_profileurl" => nil, + "in_reply_to_ostatus_uri" => nil, "statusnet_conversation_id" => convo_object.id, "attachments" => [ ObjectRepresenter.to_map(object) |