diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-02 00:08:56 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-02 00:08:56 +0000 |
| commit | 3370fab1d0af1eb65c6d7f8422129b33ca4c654b (patch) | |
| tree | 041c906375fdf1edfc956b9ab3a0a6070575d906 /test/web/twitter_api | |
| parent | 3c7280934e3bdca8d5a870dc932406ccd9915d64 (diff) | |
| parent | 834515fb511ecb8021b81f355cb2d629887edeef (diff) | |
| download | pleroma-3370fab1d0af1eb65c6d7f8422129b33ca4c654b.tar.gz pleroma-3370fab1d0af1eb65c6d7f8422129b33ca4c654b.zip | |
Merge branch 'security/emoji-xss' into 'develop'
formatter: don't add XSS emoji
See merge request pleroma/pleroma!322
Diffstat (limited to 'test/web/twitter_api')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 2 | ||||
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 2 |
2 files changed, 2 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 3f85e028b..894d20049 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>" diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 24a5c5bca..7075a2370 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -22,7 +22,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do test "A user with emoji in username", %{user: user} do expected = - "<img height='32px' width='32px' alt='karjalanpiirakka' title='karjalanpiirakka' src='/file.png' /> man" + "<img height=\"32px\" width=\"32px\" alt=\"karjalanpiirakka\" title=\"karjalanpiirakka\" src=\"/file.png\" /> man" user = %{ user |