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/controllers/account_controller/update_credentials_test.exs | |
| 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/controllers/account_controller/update_credentials_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs b/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs index cba68859e..8830d6649 100644 --- a/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs +++ b/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs @@ -75,7 +75,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) @@ -83,7 +83,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 |