diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-29 19:42:35 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-29 19:42:35 +0000 |
| commit | 66575061851f13355958fd292ee545462bf191c0 (patch) | |
| tree | 8999d2c1ccdea93e55e1ac7961778bc8d9054873 /test/web/common_api/common_api_utils_test.exs | |
| parent | 83508418fb0b91b1c5af1a3b0bab7b768a6bf6c4 (diff) | |
| parent | 5835069215b880ad261a006cf310da624a82ca4a (diff) | |
| download | pleroma-66575061851f13355958fd292ee545462bf191c0.tar.gz pleroma-66575061851f13355958fd292ee545462bf191c0.zip | |
Merge branch 'revert-83508418' into 'develop'
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
See merge request pleroma/pleroma!1505
Diffstat (limited to 'test/web/common_api/common_api_utils_test.exs')
| -rw-r--r-- | test/web/common_api/common_api_utils_test.exs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs index 38b2319ac..af320f31f 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_test.exs @@ -99,14 +99,14 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest 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 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest 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 @@ 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><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") |