diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-18 00:38:09 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-18 00:38:09 +0000 |
| commit | 1344e34ed3a337b54e450af474f81e2f326bf768 (patch) | |
| tree | 56b06a4c41d008de4daed33f6119a66a059d3691 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | 6d6f48d0795cc12d3c5aca5d90ae51b10086996d (diff) | |
| parent | 4ed2618f6c732ba1009510f5698a5d981a151925 (diff) | |
| download | pleroma-1344e34ed3a337b54e450af474f81e2f326bf768.tar.gz pleroma-1344e34ed3a337b54e450af474f81e2f326bf768.zip | |
Merge branch 'feature/allow-link-rel-attribute' into 'develop'
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
See merge request pleroma/pleroma!946
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 059d5237d..74bf05708 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1632,7 +1632,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert user = json_response(conn, 200) assert user["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" rel="tag">#cofe</a> with <span class="h-card"><a data-user=") <> user2.id <> ~s(" class="u-url mention" href=") <> user2.ap_id <> ~s(">@<span>) <> user2.nickname <> ~s(</span></a></span>) |