hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

AccountView: fix for other forms of <br> in bio

Browse source 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-03-22 16:38:12 +01:00
commit 15be6ba9c2
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
View file

@ -76,7 +76,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
conn =
patch(conn, "/api/v1/accounts/update_credentials", %{
"note" => "I drink #cofe with @#{user2.nickname}"
"note" => "I drink #cofe with @#{user2.nickname}\n\nsuya.."
})
assert user_data = json_response(conn, 200)
@ -84,7 +84,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
assert user_data["note"] ==
~s(I drink <a class="hashtag" data-tag="cofe" href="http://localhost:4001/tag/cofe">#cofe</a> with <span class="h-card"><a data-user="#{
user2.id
}" class="u-url mention" href="#{user2.ap_id}" rel="ugc">@<span>#{user2.nickname}</span></a></span>)
}" class="u-url mention" href="#{user2.ap_id}" rel="ugc">@<span>#{user2.nickname}</span></a></span><br/><br/>suya..)
end
test "updates the user's locking status", %{conn: conn} do