From ea75da8eb84f38cd04cccabf7e1e408b40d56a8c Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Tue, 12 Sep 2017 13:50:11 -0400 Subject: [PATCH] Sync up with Parsoid parserTests.txt This now aligns with Parsoid commit c695317294087a691bad649237f9d86fbfce64c5 Change-Id: I6cb1eafcaf23846aba25714e6177c0e510c0b174 --- tests/parser/parserTests.txt | 78 ++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 00d2538c80..ff777e7098 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -307,7 +307,7 @@ CircularRef !! html/parsoid

[1]

-
  1. ↑ Error: Expansion loop detected at Template:CircularRef
+
  1. ↑ Error: Expansion loop detected at Template:CircularRef
!! end !! test @@ -2449,7 +2449,7 @@ Block tag pre foo !! html/parsoid -

foo

+

foo

!! end !!test @@ -6687,7 +6687,7 @@ Don't break on | in extension attribute in template !! html/parsoid

[1]

-
  1. ↑ ha
+
  1. ↑ ha
!! end ## We don't support roundtripping of these attributes in Parsoid. @@ -6862,7 +6862,7 @@ T107652: s in templates that also generate table cell attributes should be
Foo[1]
-
  1. ↑ foo
+
  1. ↑ foo
!! end !! test @@ -7322,8 +7322,8 @@ parsoid=wt2html !! html - - + +
!! end @@ -9706,7 +9706,7 @@ parsoid !! wikitext * !! html/parsoid -
    +
      !! end !! test @@ -9876,6 +9876,17 @@ parsoid=wt2html,wt2wt
      • not a li-hack
      +!! html/parsoid +
      • foo
      • +
      • li-hack
      • +
      • templated li-hack
      • +
      • unsupported li-hack with preceding comments
      + +
        +
      • not a li-hack +
      • +
      + !!end !! test @@ -9911,9 +9922,9 @@ Parsoid: Test of whitespace serialization with Templated bullets parsoid !! wikitext * {{bullet}} -!! html +!! html/parsoid
        -
      • Bar
      • +
      • Bar
      !! end @@ -13221,7 +13232,7 @@ Templates: Wiki Tables: 7. Fosterable s should get fostered -
      1. ↑ foo
      +
      1. ↑ foo
      !!end !! test @@ -14260,6 +14271,20 @@ Image with caption, T55312 #3
      Caption page=stuff
      !! end +!! test +Image caption with pipe entity +!! wikitext +[[File:Foobar.jpg|thumb|one | two]] +[[File:Foobar.jpg|thumb|one ''two'' | three]] +!! html/php +
      one | two
      +
      one two | three
      + +!! html/parsoid +
      one | two
      +
      one two | three
      +!! end + !! test Allow empty links in image captions (T62753) !! options @@ -15580,7 +15605,7 @@ T93580: 1. Templated inside block images !! html/parsoid
      Caption with templated ref: [1]
      -
      1. ↑ foo
      +
      1. ↑ foo
      !! end !! test @@ -15592,7 +15617,7 @@ T93580: 2. inside inline images !! html/parsoid

      -
      1. ↑ foo
      +
      1. ↑ foo
      !! end !! test @@ -15604,7 +15629,7 @@ T93580: 3. Templated inside inline images !! html/parsoid

      -
      1. ↑ foo
      +
      1. ↑ foo
      !! end ### @@ -18139,7 +18164,7 @@ Parser hook: static parser hook inside a comment

      !! html/parsoid -

      +

      !! end # Nested template calls; this case was broken by Parser.php rev 1.506, @@ -20925,7 +20950,7 @@ HTML with raw HTML ($wgRawHtml==true) wgRawHtml=1 !! wikitext -!! html +!! html/php

      !! end @@ -24424,12 +24449,12 @@ Empty LI and TR nodes should not be stripped from top-level content !! html/parsoid
      • a
      • -
      • +
      • b
      - + @@ -24443,9 +24468,9 @@ Empty TR nodes should not be stripped if they have any attributes set {{EmptyTRWithHTMLAttrTest}} !! html/parsoid
      foo
      - + - +
      foo
      bar
      !! end @@ -25731,7 +25756,7 @@ parsoid=html2wt 'foo [1] 'foo
      test
      'foo and
      bar -
        +
        1. ↑ test
        !! wikitext @@ -25881,7 +25906,7 @@ a parsoid=html2wt !! html/parsoid

        foo [1]

        -
          +
          1. ↑ a b
          @@ -26289,7 +26314,7 @@ RT-ed inter-element separators should be valid separators !! html/parsoid - +
          !!end @@ -26436,7 +26461,7 @@ parsoid !! html - +
          foo
          @@ -26458,7 +26483,7 @@ parsoid !! html - + @@ -29255,17 +29280,18 @@ unclosed internal link XSS (T137264)

          [[#%3Cscript%3Ealert(1)%3C/script%3E|

          !! end +# Use $wgRawHtml to inject a -!! html+tidy +!! html/php+tidy
          -- 2.20.1