Merge "Add more tests for paragraphs and headings with extra spacing"

diff --combined tests/parser/parserTests.txt
index fa9a353,a9ceafa..d5e221a
--- 1/tests/parser/parserTests.txt
--- 2/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@@ -303,6 -303,59 +303,59 @@@
  
  !! end
  
+ !! test
+ Extra newlines: More paragraphs with indented comment
+ !! input
+ a
+ 
+    <!--boo-->
+ 
+ b
+ !!result
+ <p>a
+ </p><p><br />
+ b
+ </p>
+ !!end
+ 
+ !! test
+ Extra newlines followed by heading
+ !! input
+ a
+ 
+ 
+ 
+ =b=
+ [[a]]
+ 
+ 
+ =b=
+ !! result
+ <p>a
+ </p><p><br />
+ </p>
+ <h1><span class="mw-headline" id="b">b</span><span class="mw-editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: b">edit</a>]</span></h1>
+ <p><a href="/index.php?title=A&amp;action=edit&amp;redlink=1" class="new" title="A (page does not exist)">a</a>
+ </p><p><br />
+ </p>
+ <h1><span class="mw-headline" id="b_2">b</span><span class="mw-editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: b">edit</a>]</span></h1>
+ 
+ !! end
+ 
+ !! test
+ Extra newlines between heading and content are swallowed
+ !! input
+ =b=
+ 
+ 
+ 
+ [[a]]
+ !! result
+ <h1><span class="mw-headline" id="b">b</span><span class="mw-editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: b">edit</a>]</span></h1>
+ <p><a href="/index.php?title=A&amp;action=edit&amp;redlink=1" class="new" title="A (page does not exist)">a</a>
+ </p>
+ !! end
+ 
  !! test
  Parsing an URL
  !! input
@@@ -4333,27 -4386,6 +4386,27 @@@ mótmælenda[[söfnuður|söfnuðir]]xx
  </p>
  !! end
  
 +!! test
 +Parsoid link trail escaping
 +!! options
 +parsoid=html2wt,html2html
 +!! input
 +[[apple]]<nowiki/>s
 +!! result
 +<p><a rel="mw:WikiLink" href="Apple">apple</a>s</p>
 +!! end
 +
 +!! test
 +Parsoid link prefix escaping
 +!! options
 +language=is
 +parsoid=html2wt,html2html
 +!! input
 +Aðrir mótmælenda<nowiki/>[[söfnuður]]
 +!! result
 +<p>Aðrir mótmælenda<a rel="mw:WikiLink" href="Söfnuður">söfnuður</a></p>
 +!! end
 +
  !! test
  Parsoid-centric test: Whitespace in ext- and wiki-links should be preserved
  !! input
@@@ -7899,198 -7931,6 +7952,198 @@@ wgEnableUploads=
  </p>
  !! end
  
 +# Parsoid-specific testing for images
 +# http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
 +# Currently imperfect due to a flaw in the Parsoid testrunner
 +# Work in progress
 +
 +!! test
 +Parsoid-specific image handling - simple image
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg]]
 +!! result
 +<p>
 +<span class="mw-default-size" typeof="mw:Image">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220" width="1941">
 +</a>
 +</span>
 +</p>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - simple image without link
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|link=]]
 +!! result
 +<p>
 +<span class="mw-default-size" typeof="mw:Image">
 +<span>
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220" width="1941">
 +</span>
 +</span>
 +</p>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - simple image with specific link
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|link=Main Page]]
 +!! result
 +<p>
 +<span class="mw-default-size" typeof="mw:Image">
 +<a href="Main_Page">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220" width="1941">
 +</a>
 +</span>
 +</p>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - simple image with size and middle alignment
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|50px|middle]]
 +!! result
 +<p>
 +<span class="mw-valign-middle" typeof="mw:Image">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/50px-Foobar.jpg" height="6" width="50">
 +</a>
 +</span>
 +</p>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - simple image with both sizes, a baseline alignment, and a caption
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|500x10px|baseline|caption]]
 +!! result
 +<p>
 +<span class="mw-valign-baseline" typeof="mw:Image" data-mw="{&quot;caption&quot;:&quot;caption&quot;}">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/89px-Foobar.jpg" height="10" width="89">
 +</a>
 +</span>
 +</p>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - simple image with border and size spec
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|50px|border|caption]]
 +!! result
 +<p>
 +<span class="mw-image-border" typeof="mw:Image" data-mw="{&quot;caption&quot;:&quot;caption&quot;}">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/50px-Foobar.jpg" height="6" width="50">
 +</a>
 +</span>
 +</p>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - thumbnail with halign, valign, and caption
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|thumb|left|baseline|caption content]]
 +!! result
 +<figure class="mw-default-size mw-halign-left mw-valign-baseline" typeof="mw:Image/Thumb">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/180px-Foobar.jpg" height="21" width="180" />
 +</a>
 +<figcaption class="mw-figcaption">caption content</figcaption>
 +</figure>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - thumbnail with specific size, halign, valign, and caption
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|thumb|50x50px|right|middle|caption]]
 +!! result
 +<figure class="mw-halign-right mw-valign-middle" typeof="mw:Image/Thumb">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/50px-Foobar.jpg" height="6" width="50" />
 +</a>
 +<figcaption class="mw-figcaption">caption</figcaption>
 +</figure>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - framed image with specific size and caption
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|500x50px|frame|caption]]
 +!! result
 +<figure typeof="mw:Image/Frame">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/442px-Foobar.jpg" height="50" width="442" />
 +</a>
 +<figcaption class="mw-figcaption">caption</figcaption>
 +</figure>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - framed image with specific size, halign, valign, and caption
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|500x50px|frame|left|baseline|caption]]
 +!! result
 +<figure class="mw-halign-left mw-valign-baseline" typeof="mw:Image/Frame">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/442px-Foobar.jpg" height="50" width="442" />
 +</a>
 +<figcaption class="mw-figcaption">caption</figcaption>
 +</figure>
 +!! end
 +
 +!! test
 +Parsoid-specific image handling - frameless image with specific size, border, and caption
 +!! options
 +parsoid
 +!! input
 +[[Image:Foobar.jpg|frameless|500x50px|border|caption]]
 +!! result
 +<p>
 +<span class="mw-image-border" typeof="mw:Image/Frameless" data-mw="{&quot;caption&quot;:&quot;caption&quot;}">
 +<a href="File:Foobar.jpg">
 +<img resource="./File:Foobar.jpg" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/442px-Foobar.jpg" height="50" width="442" />
 +</a>
 +</p>
 +!! end
 +
 +#!! test
 +#Parsoid-specific image handling - simple image with a formatted caption
 +#!! options
 +#parsoid
 +#!! input
 +#[[Image:Foobar.jpg|<table><tr><td>a</td><td>b</td></tr><tr><td>c</td></tr></table>]]
 +#!! result
 +#<p>
 +#<span typeof="mw:Image">
 +#<a class="mw-default-size" href="Image:Foobar.jpg">
 +#<img alt="Foobar.jpg" class="mw-default-size" src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220" width="1941">
 +#</a>
 +#<span>abc</span>
 +#</span>
 +#</p>
 +
  
  ###
  ### Subpages
@@@ -15046,7 -14886,6 +15099,7 @@@ parsoi
  </p>
  !!end
  
 +
  TODO:
  more images
  more tables