Commit 66575061 authored by kaniini's avatar kaniini
Browse files

Merge branch 'revert-83508418' into 'develop'

Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request !1505
parents 83508418 58350692
Pipeline #15397 passed with stages
in 43 minutes and 10 seconds
......@@ -300,9 +300,6 @@ def format_input(text, "text/markdown", options) do
|> Earmark.as_html!()
|> Formatter.linkify(options)
|> Formatter.html_escape("text/html")
|> (fn {text, mentions, tags} ->
{String.replace(text, ~r/\r?\n/, ""), mentions, tags}
end).()
end
def make_note_data(
......
......@@ -99,14 +99,14 @@ test "works for bare text/html" do
test "works for bare text/markdown" do
text = "**hello world**"
expected = "<p><strong>hello world</strong></p>"
expected = "<p><strong>hello world</strong></p>\n"
{output, [], []} = Utils.format_input(text, "text/markdown")
assert output == expected
text = "**hello world**\n\n*another paragraph*"
expected = "<p><strong>hello world</strong></p><p><em>another paragraph</em></p>"
expected = "<p><strong>hello world</strong></p>\n<p><em>another paragraph</em></p>\n"
{output, [], []} = Utils.format_input(text, "text/markdown")
......@@ -118,7 +118,7 @@ test "works for bare text/markdown" do
by someone
"""
expected = "<blockquote><p>cool quote</p></blockquote><p>by someone</p>"
expected = "<blockquote><p>cool quote</p>\n</blockquote>\n<p>by someone</p>\n"
{output, [], []} = Utils.format_input(text, "text/markdown")
......@@ -157,11 +157,11 @@ test "works for text/markdown with mentions" do
text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
expected =
"<p><strong>hello world</strong></p><p><em>another <span class=\"h-card\"><a data-user=\"#{
"<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=\"#{
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>"
}\" 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"
{output, _, _} = Utils.format_input(text, "text/markdown")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment