diff options
author | lain <lain@soykaf.club> | 2020-04-09 13:25:27 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-04-09 13:25:27 +0200 |
commit | d35e114acddf339ed398aeab02bf94abe229ac36 (patch) | |
tree | e35bbf60afa823fd1fdf2b0366249a31f040cd29 /test/web/common_api | |
parent | 8e637ae1a7b75fa08679ae9cf424650fc105de85 (diff) | |
parent | b87b798ca1660224a3192c32b035c19b18e11587 (diff) | |
download | pleroma-d35e114acddf339ed398aeab02bf94abe229ac36.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'test/web/common_api')
-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 |