summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/representers
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-03-13 09:09:44 +0000
committerlambda <lain@soykaf.club>2019-03-13 09:09:44 +0000
commit92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336 (patch)
tree56e78105e29834c60f73c1bf8c39a983d88421a4 /test/web/twitter_api/representers
parentd0e94d5f1baac7a19d6cdd33b1f54470041e7227 (diff)
parentd43b1c0b5d203fd4f195951ac7b60b666a43914f (diff)
downloadpleroma-92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336.tar.gz
pleroma-92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336.zip
Merge branch 'features/add-credo-to-ci' into 'develop'
Add credo to CI See merge request pleroma/pleroma!902
Diffstat (limited to 'test/web/twitter_api/representers')
-rw-r--r--test/web/twitter_api/representers/activity_representer_test.exs14
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,