diff options
| author | lain <lain@soykaf.club> | 2020-04-09 09:47:07 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-09 09:47:07 +0000 |
| commit | 564f3f01caa66b4632ef9e30f4f896478b1ac131 (patch) | |
| tree | 1272d395187e8719245f56d8ee7f9e3e4a875e1e /test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs | |
| parent | de592a6d33ad5c6703dc2a85fcabf6f639fdcf01 (diff) | |
| parent | d067eaa7b3bb76e7fc5ae019d6e00510b657171d (diff) | |
| download | pleroma-564f3f01caa66b4632ef9e30f4f896478b1ac131.tar.gz pleroma-564f3f01caa66b4632ef9e30f4f896478b1ac131.zip | |
Merge branch 'formatter-html-safe' into 'develop'
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
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 d78fbc5a1..2d256f63c 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 @@ -82,9 +82,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do assert user_data = json_response(conn, 200) 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="#{ + ~s(I drink <a class="hashtag" data-tag="cofe" href="http://localhost:4001/tag/cofe">#cofe</a> with <span class="h-card"><a class="u-url mention" data-user="#{ user2.id - }" class="u-url mention" href="#{user2.ap_id}" rel="ugc">@<span>#{user2.nickname}</span></a></span><br/><br/>suya..) + }" 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 |