jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
......................................................................
Sync parserTests with core
Change-Id: Ie9336c1105cf56bef6f5497b62056c28d90c03eb
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 54037bf..0d00d7f 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -12,9 +12,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "077d8b70deb6d293ab7658db502cc54e220eb1fd";
+var expectedSHA1 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "cc062f0e76a207310aba1b1ca514fbcb98b2f807";
+var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index dbfd93d..f888dca 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -575,8 +575,8 @@
add("html2html", "Fuzz testing: Parser14", "<h2
data-parsoid='{\"dsr\":[0,18,2,2]}'> onmouseover= </h2>\n<p
data-parsoid='{\"dsr\":[19,26,0,0]}'>http://</p>\n<div id=\"toc\" class=\"toc\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[27,201,26,6]}'>\n<div id=\"toctitle\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[54,95,19,6]}'>\n<h2
data-parsoid='{\"dsr\":[74,88,2,2]}'> Contents </h2>\n</div>\n\n<ul
data-parsoid='{\"dsr\":[97,193,0,0]}'><li
data-parsoid='{\"dsr\":[97,193,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main%20Page#onmouseover.3D\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main%20Page#onmouseover.3D\"},\"sa\":{\"href\":\"#onmouseover.3D\"},\"dsr\":[99,193,18,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[117,149,24,7]}'>1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[150,191,22,7]}'>onmouseover=</span></a></li></ul>\n\n</div>\n");
add("html2html", "Fuzz testing: Parser24", "\n<p
data-parsoid='{\"dsr\":[1,64,0,0]}'><span typeof=\"mw:Nowiki\"
data-parsoid='{\"dsr\":[1,21,8,9]}'>{{{</span>|\n<u class=\"|\"
data-parsoid='{\"stx\":\"html\",\"autoInsertedEnd\":true,\"dsr\":[23,64,13,0]}'><span
typeof=\"mw:Nowiki\" data-parsoid='{\"dsr\":[36,56,8,9]}'>}}}</span>} >\n<br
data-parsoid='{\"stx\":\"html\",\"noClose\":true,\"dsr\":[60,64,4,null]}'/></u></p>\n\n<p
data-parsoid='{\"dsr\":[66,108,0,0]}'><u class=\"|\"
data-parsoid='{\"stx\":\"html\",\"autoInsertedStart\":true,\"dsr\":[66,108,0,4]}'>MOVE
YOUR MOUSE CURSOR OVER THIS TEXT\n</u></p>\n<table
data-parsoid='{\"dsr\":[109,117,2,2]}'>\n<tbody
data-parsoid='{\"dsr\":[112,115,0,0]}'><tr
data-parsoid='{\"autoInsertedEnd\":true,\"autoInsertedStart\":true,\"dsr\":[112,113,0,0]}'><td
data-parsoid='{\"autoInsertedEnd\":true,\"dsr\":[112,113,1,0]}'></td></tr>\n\n</tbody></table>\n<p
data-parsoid='{\"dsr\":[118,135,0,0]}'><u class=\"|\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[118,135,13,4]}'></u></p>");
add("html2html", "Fuzz testing: encoded newline in generated HTML replacements
(bug 6577)", " \n");
-add("html2html", "Special page transclusion", "<table
class=\"mw-prefixindex-list-table\"
data-parsoid='{\"dsr\":[0,63,36,2]}'>\n<tbody
data-parsoid='{\"dsr\":[37,61,0,0]}'><tr
data-parsoid='{\"autoInsertedEnd\":true,\"autoInsertedStart\":true,\"dsr\":[37,60,0,0]}'><td
data-parsoid='{\"autoInsertedEnd\":true,\"dsr\":[37,60,1,0]}'><a
rel=\"mw:WikiLink\" href=\"./Wiki/Xyzzyx\" title=\"Wiki/Xyzzyx\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Xyzzyx\"},\"sa\":{\"href\":\"wiki/Xyzzyx\"},\"dsr\":[38,60,14,2]}'>Xyzzyx</a></td></tr>\n</tbody></table>\n");
-add("html2html", "Special page transclusion twice (bug 5021)", "<table
class=\"mw-prefixindex-list-table\"
data-parsoid='{\"dsr\":[0,63,36,2]}'>\n<tbody
data-parsoid='{\"dsr\":[37,61,0,0]}'><tr
data-parsoid='{\"autoInsertedEnd\":true,\"autoInsertedStart\":true,\"dsr\":[37,60,0,0]}'><td
data-parsoid='{\"autoInsertedEnd\":true,\"dsr\":[37,60,1,0]}'><a
rel=\"mw:WikiLink\" href=\"./Wiki/Xyzzyx\" title=\"Wiki/Xyzzyx\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Xyzzyx\"},\"sa\":{\"href\":\"wiki/Xyzzyx\"},\"dsr\":[38,60,14,2]}'>Xyzzyx</a></td></tr>\n</tbody></table>\n<table
class=\"mw-prefixindex-list-table\"
data-parsoid='{\"dsr\":[64,127,36,2]}'>\n<tbody
data-parsoid='{\"dsr\":[101,125,0,0]}'><tr
data-parsoid='{\"autoInsertedEnd\":true,\"autoInsertedStart\":true,\"dsr\":[101,124,0,0]}'><td
data-parsoid='{\"autoInsertedEnd\":true,\"dsr\":[101,124,1,0]}'><a
rel=\"mw:WikiLink\" href=\"./Wiki/Xyzzyx\" title=\"Wiki/Xyzzyx\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Xyzzyx\"},\"sa\":{\"href\":\"wiki/Xyzzyx\"},\"dsr\":[102,124,14,2]}'>Xyzzyx</a></td></tr>\n</tbody></table>\n");
+add("html2html", "Special page transclusion", "<div
class=\"mw-prefixindex-body\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,66,33,6]}'>\n<ul
data-parsoid='{\"dsr\":[34,59,0,0]}'><li data-parsoid='{\"dsr\":[34,59,1,0]}'>
<a rel=\"mw:WikiLink\" href=\"./Wiki/Xyzzyx\" title=\"Wiki/Xyzzyx\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Xyzzyx\"},\"sa\":{\"href\":\"wiki/Xyzzyx\"},\"dsr\":[36,58,14,2]}'>Xyzzyx</a>
</li></ul>\n</div>\n");
+add("html2html", "Special page transclusion twice (bug 5021)", "<div
class=\"mw-prefixindex-body\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,66,33,6]}'>\n<ul
data-parsoid='{\"dsr\":[34,59,0,0]}'><li data-parsoid='{\"dsr\":[34,59,1,0]}'>
<a rel=\"mw:WikiLink\" href=\"./Wiki/Xyzzyx\" title=\"Wiki/Xyzzyx\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Xyzzyx\"},\"sa\":{\"href\":\"wiki/Xyzzyx\"},\"dsr\":[36,58,14,2]}'>Xyzzyx</a>
</li></ul>\n</div>\n<div class=\"mw-prefixindex-body\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[67,133,33,6]}'>\n<ul
data-parsoid='{\"dsr\":[101,126,0,0]}'><li
data-parsoid='{\"dsr\":[101,126,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Wiki/Xyzzyx\" title=\"Wiki/Xyzzyx\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Xyzzyx\"},\"sa\":{\"href\":\"wiki/Xyzzyx\"},\"dsr\":[103,125,14,2]}'>Xyzzyx</a>
</li></ul>\n</div>\n");
add("html2html", "Transclusion of nonexistent MediaWiki message", "<p
data-parsoid='{\"dsr\":[0,84,0,0]}'>[/index.php?title=MediaWiki:Mainpagexxx&action=edit&redlink=1
MediaWiki:Mainpagexxx]</p>\n");
add("html2html", "Special:Search page linking.", "<p
data-parsoid='{\"dsr\":[0,38,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Special:Search\" title=\"Wiki/Special:Search\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Special:Search\"},\"sa\":{\"href\":\"wiki/Special:Search\"},\"dsr\":[0,38,22,2]}'>Special:Search</a></p>\n");
add("html2html", "Say the magic word", "<ul
data-parsoid='{\"dsr\":[0,312,0,0]}'><li data-parsoid='{\"dsr\":[0,13,1,0]}'>
Parser test</li>\n<li data-parsoid='{\"dsr\":[14,27,1,0]}'>
Parser_test</li>\n<li data-parsoid='{\"dsr\":[28,41,1,0]}'> Parser
test</li>\n<li data-parsoid='{\"dsr\":[42,55,1,0]}'> Parser_test</li>\n<li
data-parsoid='{\"dsr\":[56,69,1,0]}'> Parser test</li>\n<li
data-parsoid='{\"dsr\":[70,83,1,0]}'> Parser_test</li>\n<li
data-parsoid='{\"dsr\":[84,97,1,0]}'> Parser test</li>\n<li
data-parsoid='{\"dsr\":[98,111,1,0]}'> Parser_test</li>\n<li
data-parsoid='{\"dsr\":[112,125,1,0]}'> Parser test</li>\n<li
data-parsoid='{\"dsr\":[126,139,1,0]}'> Parser_test</li>\n<li
data-parsoid='{\"dsr\":[140,158,1,0]}'> Talk:Parser test</li>\n<li
data-parsoid='{\"dsr\":[159,177,1,0]}'> Talk:Parser_test</li>\n<li
data-parsoid='{\"dsr\":[178,191,1,0]}'> Parser test</li>\n<li
data-parsoid='{\"dsr\":[192,205,1,0]}'> Parser_test</li>\n<li
data-parsoid='{\"dsr\":[206,208,1,0]}'> </li>\n<li
data-parsoid='{\"dsr\":[209,211,1,0]}'> </li>\n<li
data-parsoid='{\"dsr\":[212,215,1,0]}'> 0</li>\n<li
data-parsoid='{\"dsr\":[216,222,1,0]}'> Talk</li>\n<li
data-parsoid='{\"dsr\":[223,229,1,0]}'> Talk</li>\n<li
data-parsoid='{\"dsr\":[230,232,1,0]}'> </li>\n<li
data-parsoid='{\"dsr\":[233,235,1,0]}'> </li>\n<li
data-parsoid='{\"dsr\":[236,312,1,0]}'>
[/index.php?title=Template:Dynamic&action=edit&redlink=1
Template:Dynamic]</li></ul>\n");
@@ -1182,8 +1182,8 @@
add("html2wt", "Inline wiki vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Inline HTML vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Mixing markup for italics and bold",
"'<nowiki/>''bold'<nowiki/>'''''bold''bolditalics'''''\n");
-add("html2wt", "Special page transclusion", "{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n");
-add("html2wt", "Special page transclusion twice (bug 5021)", "{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n");
+add("html2wt", "Special page transclusion", "<div
class=\"mw-prefixindex-body\">\n* [[wiki/Xyzzyx|Xyzzyx]] \n</div>\n");
+add("html2wt", "Special page transclusion twice (bug 5021)", "<div
class=\"mw-prefixindex-body\">\n* [[wiki/Xyzzyx|Xyzzyx]] \n</div>\n<div
class=\"mw-prefixindex-body\">\n* [[wiki/Xyzzyx|Xyzzyx]] \n</div>\n");
add("html2wt", "Transclusion of default MediaWiki message", "Main Page\n");
add("html2wt", "Transclusion of nonexistent MediaWiki message",
"[/index.php?title=MediaWiki:Mainpagexxx&action=edit&redlink=1
MediaWiki:Mainpagexxx]\n");
add("html2wt", "Transclusion of MediaWiki message with underscore",
"History\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 5789cc7..700032f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -16,7 +16,7 @@
# cat add category links
# (ignored by Parsoid, since it emits <link>s)
# ill add inter-language links
-# (ignored by Parsoid, since it emits <links>s)
+# (ignored by Parsoid, since it emits <link>s)
# subpage enable subpages (disabled by default)
# noxml don't check for XML well-formedness
# title=[[XXX]] run test using article title XXX
@@ -17173,7 +17173,8 @@
!! wikitext
{{Special:Prefixindex/Xyzzyx}}
!! html
-<table class="mw-prefixindex-list-table"><tr><td><a href="/wiki/Xyzzyx"
title="Xyzzyx">Xyzzyx</a></td></tr></table>
+<div class="mw-prefixindex-body"><ul class="mw-prefixindex-list"><li> <a
href="/wiki/Xyzzyx" title="Xyzzyx">Xyzzyx</a> </li>
+</ul></div>
!! end
@@ -17184,8 +17185,10 @@
{{Special:Prefixindex/Xyzzyx}}
{{Special:Prefixindex/Xyzzyx}}
!! html
-<table class="mw-prefixindex-list-table"><tr><td><a href="/wiki/Xyzzyx"
title="Xyzzyx">Xyzzyx</a></td></tr></table>
-<table class="mw-prefixindex-list-table"><tr><td><a href="/wiki/Xyzzyx"
title="Xyzzyx">Xyzzyx</a></td></tr></table>
+<div class="mw-prefixindex-body"><ul class="mw-prefixindex-list"><li> <a
href="/wiki/Xyzzyx" title="Xyzzyx">Xyzzyx</a> </li>
+</ul></div>
+<div class="mw-prefixindex-body"><ul class="mw-prefixindex-list"><li> <a
href="/wiki/Xyzzyx" title="Xyzzyx">Xyzzyx</a> </li>
+</ul></div>
!! end
--
To view, visit https://gerrit.wikimedia.org/r/247844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9336c1105cf56bef6f5497b62056c28d90c03eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
