diff --git a/pom.xml b/pom.xml index c1e4162..7b57bf4 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ org.jsoup jsoup - 1.19.1 + 1.23.2 junit diff --git a/src/test/java/io/github/gitbucket/markedj/MarkedTest.java b/src/test/java/io/github/gitbucket/markedj/MarkedTest.java index e94589b..ace4504 100644 --- a/src/test/java/io/github/gitbucket/markedj/MarkedTest.java +++ b/src/test/java/io/github/gitbucket/markedj/MarkedTest.java @@ -61,7 +61,7 @@ public void testReflink() throws Exception { @Test public void testIns() throws Exception { String result = Marked.marked("~~123~~"); - assertEquals("

\n 123

", result); + assertEquals("

123

", result); } @Test @@ -121,7 +121,7 @@ public void testBreaks() throws Exception { //options.setGfm(true); // default is true String result = Marked.marked(md, options); - assertEquals("

first line
\n second line

", result); + assertEquals("

first line\n
\n second line

", result); } } @@ -232,8 +232,10 @@ public void testSanitize() throws Exception { String result = Marked.marked("- test", options); // It's not clean but tag is closed at least. assertEquals(" ", result); + "
  • test
  • \n" + + " \n" + + "\n" + + " ", result); } } @@ -269,7 +271,7 @@ private String loadResourceAsString(String path) throws IOException { public void testHardLineBreakWithSpaces() { String result = Marked.marked("Line 1 \n" + "Line 2"); - assertEquals("

    Line 1
    \n" + + assertEquals("

    Line 1\n
    \n" + " Line 2

    ", result); } @@ -286,7 +288,7 @@ public void testStyleAttributeRejectsArbitraryCss() throws Exception { String result = Marked.marked( "
    clickjack
    "); - assertEquals("
    \n clickjack\n
    ", result); + assertEquals("
    clickjack
    ", result); } // The fix for the above must not break the one legitimate use of `style`: @@ -302,7 +304,7 @@ public void testStyleAttributeAllowsTableAlignment() throws Exception { public void testHardLineBreakWithBackslash() { String result = Marked.marked("Line 1\\\n" + "Line 2"); - assertEquals("

    Line 1
    \n" + + assertEquals("

    Line 1\n
    \n" + " Line 2

    ", result); } diff --git a/src/test/resources/gitbucket.html b/src/test/resources/gitbucket.html index 95c43b3..de67646 100644 --- a/src/test/resources/gitbucket.html +++ b/src/test/resources/gitbucket.html @@ -26,11 +26,11 @@

    Installation

    1. Download latest gitbucket.war from the release page.
    2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
    3. -
    4. Access http://[hostname]:[port]/gitbucket/ using your web browser.
    5. +
    6. Access http://[hostname]:[port]/gitbucket/ using your web browser.

    If you are using Gitbucket behind a webserver please make sure you have increased the client_max_body_size (on nginx)

    The default administrator account is root and password is root.

    -

    or you can start GitBucket by java -jar gitbucket.war without servlet container. In this case, GitBucket URL is http://[hostname]:8080/. You can specify following options.

    +

    or you can start GitBucket by java -jar gitbucket.war without servlet container. In this case, GitBucket URL is http://[hostname]:8080/. You can specify following options.