diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-24 22:15:37 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-24 22:15:37 +0300 |
| commit | 8f1d622b8dfaf6bf00d5f1bf6b988c12766b72ea (patch) | |
| tree | d913b98c4a089fdf872716a861626d698cdb1e63 /test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs | |
| parent | 13cbb9f6ada8dcb15bb7ed12be4d88a18c5db7f7 (diff) | |
| parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
| download | pleroma-8f1d622b8dfaf6bf00d5f1bf6b988c12766b72ea.tar.gz pleroma-8f1d622b8dfaf6bf00d5f1bf6b988c12766b72ea.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
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 43538cb17..51cebe567 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 @@ -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 |