diff options
author | kaniini <nenolod@gmail.com> | 2019-02-27 08:45:43 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-02-27 08:45:43 +0000 |
commit | 14bc6bd40f0ea7879cd75444939669ee6e6ac85c (patch) | |
tree | 89261d7cae8c7edc474d2d27a951a1b5eb8d0ba4 /test/web/common_api | |
parent | a50a47a0114dab06205eabf5bd42369328ce80e2 (diff) | |
parent | 5d961d536cd190c8201d53624680a6f3384ffd9b (diff) | |
download | pleroma-14bc6bd40f0ea7879cd75444939669ee6e6ac85c.tar.gz |
Merge branch 'fix/formatter' into 'develop'
Bugfix: markdown in formatter
Closes #688
See merge request pleroma/pleroma!869
Diffstat (limited to 'test/web/common_api')
-rw-r--r-- | test/web/common_api/common_api_utils_test.exs | 18 |
1 files changed, 15 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 dc7b4c229..684f2a23f 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_test.exs @@ -104,6 +104,18 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do {output, [], []} = Utils.format_input(text, "text/markdown") assert output == expected + + text = """ + > cool quote + + by someone + """ + + expected = "<blockquote><p>cool quote</p>\n</blockquote>\n<p>by someone</p>\n" + + {output, [], []} = Utils.format_input(text, "text/markdown") + + assert output == expected end test "works for text/markdown with mentions" do @@ -113,11 +125,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='#{ + "<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\">@<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\">@<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") |