diff options
author | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:41:31 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:41:31 +0000 |
commit | 19263f30c3819f922586b537467e888574c334d7 (patch) | |
tree | e9c7a490b7ed245cf854c072aae932eb54fd38e8 /test/web/common_api/common_api_utils_test.exs | |
parent | 760df67a7b767d113a0ff2b351f872caf8751832 (diff) | |
parent | ae1d371428e16b738b8ec638e411e5e8c1ac4937 (diff) | |
download | pleroma-19263f30c3819f922586b537467e888574c334d7.tar.gz pleroma-19263f30c3819f922586b537467e888574c334d7.zip |
Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
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") |