jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330731 )
Change subject: Sync up with Parsoid parserTests.
......................................................................
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit 974dd5b3d70acf59bb15e057dc37e3702195f3e0
Change-Id: Ia45d8e2539e7fec23503706be1b40a6eaf1f5888
---
M tests/parser/parserTests.txt
1 file changed, 37 insertions(+), 5 deletions(-)
Approvals:
C. Scott Ananian: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index f6b6bce..56816e1 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -530,6 +530,8 @@
!! test
Heading with line break in nowiki
+!! options
+parsoid=wt2html
!! wikitext
== A <nowiki>B
C</nowiki> ==
@@ -537,6 +539,9 @@
<h2><span class="mw-headline" id="A_B.0AC">A B
C</span><span class="mw-editsection"><span
class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=1" title="Edit
section: A B C">edit</a><span
class="mw-editsection-bracket">]</span></span></h2>
+!! html/parsoid
+<h2 id="A_B.0AC">A <span typeof="mw:Nowiki">B
+C</span> </h2>
!! end
!! test
@@ -6477,6 +6482,14 @@
!! end
!! test
+Break on | in element attribute name in template
+!! wikitext
+{{echo|<div cla|ss="hiho">ha</div>}}
+!! html/parsoid
+<p about="#mwt1" typeof="mw:Transclusion"
data-parsoid='{"pi":[[{"k":"1"},{"k":"ss","named":true}]]}'
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"<div
cla"},"ss":{"wt":"\"hiho\">ha</div>"}},"i":0}}]}'><div cla</p>
+!! end
+
+!! test
Don't break on | in extension attribute in template
!! wikitext
{{echo|<ref name="hi|ho">ha</ref>}}
@@ -10933,7 +10946,8 @@
!! html/parsoid
<table>
-<tbody><tr><td>[[<span about="#mwt5" typeof="mw:Param"
data-parsoid='{"src":"{{{1}}}"}'>{{{1}}}</span>|<span about="#mwt2"
typeof="mw:Param" data-parsoid='{"src":"{{{2}}}"}'>{{{2}}}</span>]]</td></tr>
+<tbody><tr><td>[[<span about="#mwt5" typeof="mw:Param"
data-mw='{"parts":[{"templatearg":{"target":{"wt":"1"},"params":{},"i":0}}]}'>{{{1}}}</span>|<span
about="#mwt2" typeof="mw:Param"
data-mw='{"parts":[{"templatearg":{"target":{"wt":"2"},"params":{},"i":0}}]}'>{{{2}}}</span>]]</td></tr>
+</tbody></table>
!! end
# See: T2553
@@ -11625,7 +11639,7 @@
|c
|}
!!html/parsoid
-<meta typeof="mw:Includes/IncludeOnly"
data-parsoid='{"src":"<includeonly>a</includeonly>"}'/><meta
typeof="mw:Includes/IncludeOnly/End" data-parsoid='{"src":""}'/><table
about="#mwt2" typeof="mw:ExpandedAttrs"
data-parsoid='{"a":{"{{{b}}}":null},"sa":{"{{{b}}}":""}}'
data-mw='{"attribs":[[{"txt":"{{{b}}}","html":"<span about=\"#mwt1\"
typeof=\"mw:Param\"
data-parsoid='{\"dsr\":[31,38,null,null],\"src\":\"{{{b}}}\"}'>{{{b}}}</span>"},{"html":""}]]}'>
+<meta typeof="mw:Includes/IncludeOnly"
data-parsoid='{"src":"<includeonly>a</includeonly>"}'/><meta
typeof="mw:Includes/IncludeOnly/End" data-parsoid='{"src":""}'/><table
about="#mwt2" typeof="mw:ExpandedAttrs"
data-parsoid='{"a":{"{{{b}}}":null},"sa":{"{{{b}}}":""}}'
data-mw='{"attribs":[[{"txt":"{{{b}}}","html":"<span about=\"#mwt1\"
typeof=\"mw:Param\"
data-parsoid='{\"pi\":[[]],\"dsr\":[31,38,null,null]}'
data-mw='{\"parts\":[{\"templatearg\":{\"target\":{\"wt\":\"b\"},\"params\":{},\"i\":0}}]}'>{{{b}}}</span>"},{"html":""}]]}'>
<tbody><tr><td>c</td></tr>
</tbody></table>
!!end
@@ -12514,11 +12528,16 @@
Templates: Parameters substituted at the top-level
!! wikitext
{{{foo|''who'' {{echo|me}}? '''never!'''}}}
+
+{{{foo|bar|baz}}}
!! html/php
<p><i>who</i> me? <b>never!</b>
+</p><p>bar
</p>
!! html/parsoid
-<p about="#mwt2" typeof="mw:Param"
data-parsoid="{"src":"{{{foo|''who'' {{echo|me}}?
'''never!'''}}}"}"><i>who</i> me? <b>never!</b></p>
+<p about="#mwt2" typeof="mw:Param"
data-mw='{"parts":[{"templatearg":{"target":{"wt":"foo"},"params":{"1":{"wt":"''who''
{{echo|me}}? '''never!'''"}},"i":0}}]}'><i>who</i> me?
<b>never!</b></p>
+
+<p about="#mwt3" typeof="mw:Param"
data-mw='{"parts":[{"templatearg":{"target":{"wt":"foo"},"params":{"1":{"wt":"bar"},"2":{"wt":"baz"}},"i":0}}]}'>bar</p>
!! end
!!test
@@ -17689,6 +17708,8 @@
# Known to produce bad XML for now
!! test
Fuzz testing: Parser24
+!! options
+parsoid=wt2html
!! wikitext
{|
{{{|
@@ -17698,7 +17719,7 @@
MOVE YOUR MOUSE CURSOR OVER THIS TEXT
|
-!! html
+!! html/php
<table>
{{{|
<u class="|">}}}} >
@@ -17711,6 +17732,14 @@
</tr>
</table>
+!! html/parsoid
+<p data-parsoid='{"fostered":true,"autoInsertedEnd":true}'>{{{|
+<u class="|" about="#mwt2" typeof="mw:ExpandedAttrs"
data-parsoid='{"stx":"html","a":{"{{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx--><noinclude>}}}}":null},"sa":{"{{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx--><noinclude>}}}}":""},"autoInsertedEnd":true}'
data-mw='{"attribs":[[{"txt":"{{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx-->}}}}","html":"{<span
about=\"#mwt1\" typeof=\"mw:Param\"
data-parsoid='{\"pi\":[[]],\"dsr\":[21,79,null,null]}'
data-mw='{\"parts\":[{\"templatearg\":{\"target\":{\"wt\":\"SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx-->&lt;noinclude>\"},\"params\":{},\"i\":0}}]}'>{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx-->}}}</span>}"},{"html":""}]]}'>
+<br style="onmouseover='alert(document.cookie);' "
data-parsoid='{"stx":"html","selfClose":true}'/></u></p><p
data-parsoid='{"fostered":true,"autoInsertedEnd":true}'><u class="|"
about="#mwt2" typeof="mw:ExpandedAttrs"
data-parsoid='{"stx":"html","a":{"{{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx--><noinclude>}}}}":null},"sa":{"{{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx--><noinclude>}}}}":""},"autoInsertedEnd":true,"autoInsertedStart":true}'
data-mw='{"attribs":[[{"txt":"{{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx-->}}}}","html":"{<span
about=\"#mwt1\" typeof=\"mw:Param\"
data-parsoid='{\"pi\":[[]],\"dsr\":[21,79,null,null]}'
data-mw='{\"parts\":[{\"templatearg\":{\"target\":{\"wt\":\"SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx-->&lt;noinclude>\"},\"params\":{},\"i\":0}}]}'>{{{SSSll!!!!!!!VVVV)]]][[Special:*xxxxxxx-->}}}</span>}"},{"html":""}]]}'>MOVE
YOUR MOUSE CURSOR OVER THIS TEXT</u></p><table
data-parsoid='{"autoInsertedEnd":true}'>
+
+
+
+<tbody><tr
data-parsoid='{"autoInsertedEnd":true,"autoInsertedStart":true}'><td
data-parsoid='{"autoInsertedEnd":true}'></td></tr></tbody></table>
!! end
# Note: the current result listed for this is not what the original one was,
@@ -17729,9 +17758,12 @@
<LI CLASS=||
>
}}}blah" onmouseover="alert('hello world');" align="left"'''MOVE MOUSE CURSOR
OVER HERE
-!! html
+!! html/php
<p><LI CLASS=blah" onmouseover="alert('hello world');" align="left"<b>MOVE
MOUSE CURSOR OVER HERE</b>
</p>
+!! html/parsoid
+<span about="#mwt1" typeof="mw:Param"
data-parsoid='{"pi":[[{"k":"1"},{"k":"2"},{"k":"3"}]]}'
data-mw='{"parts":[{"templatearg":{"target":{"wt":"\n"},"params":{"1":{"wt":"
\n<LI CLASS="},"2":{"wt":""},"3":{"wt":"\n >\n"}},"i":0}},"blah\"
onmouseover=\"alert('hello world');\" align=\"left\"'''MOVE
MOUSE CURSOR OVER HERE"]}'>
+</span><p about="#mwt1"><LI CLASS=blah" onmouseover="alert('hello world');"
align="left"<b>MOVE MOUSE CURSOR OVER HERE</b></p>
!! end
!!test
--
To view, visit https://gerrit.wikimedia.org/r/330731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia45d8e2539e7fec23503706be1b40a6eaf1f5888
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits