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/common_api/common_api_utils_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/common_api/common_api_utils_test.exs')
| -rw-r--r-- | test/web/common_api/common_api_utils_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs index d383d1714..98cf02d49 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_test.exs @@ -159,11 +159,11 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do {output, _, _} = Utils.format_input(text, "text/markdown") assert output == - ~s(<p><strong>hello world</strong></p><p><em>another <span class="h-card"><a data-user="#{ + ~s(<p><strong>hello world</strong></p><p><em>another <span class="h-card"><a class="u-url mention" data-user="#{ user.id - }" class="u-url mention" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> and <span class="h-card"><a data-user="#{ + }" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> and <span class="h-card"><a class="u-url mention" data-user="#{ user.id - }" class="u-url mention" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> <a href="http://google.com" rel="ugc">google.com</a> paragraph</em></p>) + }" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> <a href="http://google.com" rel="ugc">google.com</a> paragraph</em></p>) end end |