diff options
author | Maxim Filippov <colixer@gmail.com> | 2019-09-24 13:00:48 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2019-09-24 13:00:48 +0300 |
commit | 5e9759cd7d0730c14bcc44e9b3dbda94947d602f (patch) | |
tree | 5917d89cad99d14a246e33f3e8ebd56e70abe20b /test/web/common_api/common_api_utils_test.exs | |
parent | 79c3443b609663ab23a4353ebdb7e5e2f0e6a150 (diff) | |
parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
download | pleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.tar.gz pleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.zip |
Merge branch 'develop' into feature/return-link-for-password-reset
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 230146451..2588898d0 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_test.exs @@ -157,11 +157,11 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*" expected = - "<p><strong>hello world</strong></p>\n<p><em>another <span class=\"h-card\"><a data-user=\"#{ + ~s(<p><strong>hello world</strong></p>\n<p><em>another <span class="h-card"><a data-user="#{ user.id - }\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> and <span class=\"h-card\"><a data-user=\"#{ + }" 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="#{ user.id - }\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> <a href=\"http://google.com\">google.com</a> paragraph</em></p>\n" + }" 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>\n) {output, _, _} = Utils.format_input(text, "text/markdown") |