diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-23 19:32:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-31 13:42:02 +0300 |
| commit | e99e2a86afd50c8a7d0f243e1e4017f06ec75441 (patch) | |
| tree | e09cc22ff47d7aee9dd91a26d4c3d5aaeafe8535 /test/web/mastodon_api/views | |
| parent | c4d3ccc7b952445069ed3fc8586da14af6db937d (diff) | |
| download | pleroma-e99e2a86afd50c8a7d0f243e1e4017f06ec75441.tar.gz pleroma-e99e2a86afd50c8a7d0f243e1e4017f06ec75441.zip | |
Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
Diffstat (limited to 'test/web/mastodon_api/views')
| -rw-r--r-- | test/web/mastodon_api/views/account_view_test.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs index d60ed7b64..983886c6b 100644 --- a/test/web/mastodon_api/views/account_view_test.exs +++ b/test/web/mastodon_api/views/account_view_test.exs @@ -32,7 +32,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do background: background_image, nickname: "shp@shitposter.club", name: ":karjalanpiirakka: shp", - bio: "<script src=\"invalid-html\"></script><span>valid html</span>", + bio: + "<script src=\"invalid-html\"></script><span>valid html</span>. a<br>b<br/>c<br >d<br />f", inserted_at: ~N[2017-08-15 15:47:06.597036] }) @@ -46,7 +47,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do followers_count: 3, following_count: 0, statuses_count: 5, - note: "<span>valid html</span>", + note: "<span>valid html</span>. a<br/>b<br/>c<br/>d<br/>f", url: user.ap_id, avatar: "http://localhost:4001/images/avi.png", avatar_static: "http://localhost:4001/images/avi.png", @@ -63,7 +64,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do fields: [], bot: false, source: %{ - note: "valid html", + note: "valid html. a\nb\nc\nd\nf", sensitive: false, pleroma: %{ actor_type: "Person", |