diff options
author | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
---|---|---|
committer | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
commit | 54e7087ab412a488f8ad7286aef89d313e5e7b14 (patch) | |
tree | 9391107eb5aec3940bf6150539acc38e85224751 /test/web/twitter_api/representers | |
parent | 9338f061a303ae3d57a8ea1af524c2ca51929f8d (diff) | |
parent | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (diff) | |
download | pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.tar.gz pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.zip |
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
Diffstat (limited to 'test/web/twitter_api/representers')
-rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 14 |
1 files changed, 9 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 0e554623c..d154385a0 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -4,12 +4,12 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do use Pleroma.DataCase - alias Pleroma.User alias Pleroma.Activity alias Pleroma.Object + alias Pleroma.User + alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter - alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.TwitterAPI.UserView import Pleroma.Factory @@ -101,10 +101,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do recipients: to } + corndog_emojo = ~s(<img height="32px" width="32px" alt="2hu" title="2hu" src="corndog.png" />) + expected_html = - "<p>2hu <img height=\"32px\" width=\"32px\" alt=\"2hu\" title=\"2hu\" src=\"corndog.png\" /></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>" + ~s(<p>2hu ) <> + corndog_emojo <> + ~s(</p>alert\('YAY'\)Some ) <> + corndog_emojo <> + ~s( content mentioning <a href=") <> mentioned_user.ap_id <> ~s(">@shp</a>) expected_status = %{ "id" => activity.id, |