projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hotfix/hackney-1.15.2' into 'develop'
[akkoma]
/
test
/
web
/
common_api
/
common_api_utils_test.exs
diff --git
a/test/web/common_api/common_api_utils_test.exs
b/test/web/common_api/common_api_utils_test.exs
index c281dd1f1c2f0e785de02eb7adb39368293ec477..2588898d043dc8f9b09429f5a94f3639530fe825 100644
(file)
--- a/
test/web/common_api/common_api_utils_test.exs
+++ b/
test/web/common_api/common_api_utils_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.UtilsTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.UtilsTest do
@@
-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 =
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
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
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")
{output, _, _} = Utils.format_input(text, "text/markdown")