C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351726 )
Change subject: Fix 'ISBN with space-delimited number' test case.
......................................................................
Fix 'ISBN with space-delimited number' test case.
Change-Id: I26571b500dad45825145c692586e71fa2e9bd45d
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/26/351726/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index e0b2fe8..efda162 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -507,7 +507,6 @@
add("html2html", "Parents of subpages, two levels up, with lots of extra
trailing slashes.", "<p
data-parsoid='{\"dsr\":[0,72,0,0]}'>[/index.php?title=Subpage_test/L1&action=edit&redlink=1
Subpage test/L1]</p>\n");
add("html2html", "RAW magic word", "<p
data-parsoid='{\"dsr\":[0,72,0,0]}'>[/index.php?title=Template:QUERTY&action=edit&redlink=1
Template:QUERTY]</p>\n");
add("html2html", "Out-of-order TOC heading levels", "<div id=\"toc\"
class=\"toc\" data-parsoid='{\"stx\":\"html\",\"dsr\":[0,547,26,6]}'><div
id=\"toctitle\" class=\"toctitle\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[26,84,36,6]}'>\n<h2 id=\"Contents\"
data-parsoid='{\"dsr\":[63,77,2,2]}'> Contents </h2>\n</div>\n\n<ul
data-parsoid='{\"dsr\":[86,158,0,0]}'><li
data-parsoid='{\"dsr\":[86,158,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#2\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#2\"},\"sa\":{\"href\":\"#2\"},\"dsr\":[88,158,5,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[93,125,24,7]}'>1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[126,156,22,7]}'>2</span></a></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[160,384,0,0]}'><li
data-parsoid='{\"dsr\":[160,311,1,0]}'><ul
data-parsoid='{\"dsr\":[161,311,0,0]}'><li
data-parsoid='{\"dsr\":[161,235,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#6\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#6\"},\"sa\":{\"href\":\"#6\"},\"dsr\":[163,235,5,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[168,202,24,7]}'>1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[203,233,22,7]}'>6</span></a></li>\n<li
data-parsoid='{\"dsr\":[236,311,2,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#3\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#3\"},\"sa\":{\"href\":\"#3\"},\"dsr\":[239,311,5,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[244,278,24,7]}'>1.2</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[279,309,22,7]}'>3</span></a></li></ul></li>\n<li
data-parsoid='{\"dsr\":[312,384,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#1\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#1\"},\"sa\":{\"href\":\"#1\"},\"dsr\":[314,384,5,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[319,351,24,7]}'>2</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[352,382,22,7]}'>1</span></a></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[386,539,0,0]}'><li
data-parsoid='{\"dsr\":[386,539,1,0]}'><ul
data-parsoid='{\"dsr\":[387,539,0,0]}'><li
data-parsoid='{\"dsr\":[387,461,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#5\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#5\"},\"sa\":{\"href\":\"#5\"},\"dsr\":[389,461,5,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[394,428,24,7]}'>2.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[429,459,22,7]}'>5</span></a></li>\n<li
data-parsoid='{\"dsr\":[462,539,2,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#2_2\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#2_2\"},\"sa\":{\"href\":\"#2_2\"},\"dsr\":[465,539,7,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[472,506,24,7]}'>2.2</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[507,537,22,7]}'>2</span></a></li></ul></li></ul>\n\n</div>\n\n<h2
id=\"2\" data-parsoid='{\"dsr\":[549,556,2,2]}'> 2 </h2>\n\n<h6 id=\"6\"
data-parsoid='{\"dsr\":[558,573,6,6]}'> 6 </h6>\n\n<h3 id=\"3\"
data-parsoid='{\"dsr\":[575,584,3,3]}'> 3 </h3>\n\n<h1 id=\"1\"
data-parsoid='{\"dsr\":[586,591,1,1]}'> 1 </h1>\n\n<h5 id=\"5\"
data-parsoid='{\"dsr\":[593,606,5,5]}'> 5 </h5>\n\n<h2 id=\"2_2\"
data-parsoid='{\"dsr\":[608,615,2,2]}'> 2 </h2>\n");
-add("html2html", "ISBN with space-delimited number", "<p
data-parsoid='{\"dsr\":[0,58,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Special:BookSources/9290170328\"
title=\"Wiki/Special:BookSources/9290170328\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Special:BookSources/9290170328\"},\"sa\":{\"href\":\"wiki/Special:BookSources/9290170328\"},\"dsr\":[0,58,38,2]}'>ISBN
92 9017 032 8</a></p>\n");
add("html2html", "ISBN length", "<p data-parsoid='{\"dsr\":[0,14,0,0]}'>ISBN
123456789</p>\n\n<p data-parsoid='{\"dsr\":[16,71,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Special:BookSources/1234567890\"
title=\"Wiki/Special:BookSources/1234567890\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Special:BookSources/1234567890\"},\"sa\":{\"href\":\"wiki/Special:BookSources/1234567890\"},\"dsr\":[16,71,38,2]}'>ISBN
1234567890</a></p>\n\n<p data-parsoid='{\"dsr\":[73,89,0,0]}'>ISBN
12345678901</p>\n");
add("html2html", "ISBN with trailing year (T9110)", "<p
data-parsoid='{\"dsr\":[0,65,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Special:BookSources/1234567890\"
title=\"Wiki/Special:BookSources/1234567890\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Special:BookSources/1234567890\"},\"sa\":{\"href\":\"wiki/Special:BookSources/1234567890\"},\"dsr\":[0,58,38,2]}'>ISBN
1-234-56789-0</a> - 2006</p>\n\n<p data-parsoid='{\"dsr\":[67,132,0,0]}'><a
rel=\"mw:WikiLink\" href=\"./Wiki/Special:BookSources/1234567890\"
title=\"Wiki/Special:BookSources/1234567890\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Special:BookSources/1234567890\"},\"sa\":{\"href\":\"wiki/Special:BookSources/1234567890\"},\"dsr\":[67,125,38,2]}'>ISBN
1 234 56789 0</a> - 2006</p>\n");
add("html2html", "Self-link in language variants", "<p
data-parsoid='{\"dsr\":[0,46,0,0]}'>Both Dunav and Дунав are names for this
river.</p>\n");
@@ -1025,7 +1024,6 @@
add("html2wt", "Template caching", "This is a test template\nThis is a test
template\n");
add("html2wt", "Inclusion of !userCanEdit() content", "== header ==\n");
add("html2wt", "Out-of-order TOC heading levels", "<div id=\"toc\"
class=\"toc\"><div id=\"toctitle\" class=\"toctitle\">\n== Contents
==\n</div>\n\n* [[#2|<span class=\"tocnumber\">1</span> <span
class=\"toctext\">2</span>]]\n\n** [[#6|<span class=\"tocnumber\">1.1</span>
<span class=\"toctext\">6</span>]]\n** [[#3|<span
class=\"tocnumber\">1.2</span> <span class=\"toctext\">3</span>]]\n* [[#1|<span
class=\"tocnumber\">2</span> <span class=\"toctext\">1</span>]]\n\n**
[[#5|<span class=\"tocnumber\">2.1</span> <span
class=\"toctext\">5</span>]]\n** [[#2_2|<span class=\"tocnumber\">2.2</span>
<span class=\"toctext\">2</span>]]\n\n</div>\n\n== 2 ==\n\n====== 6
======\n\n=== 3 ===\n\n= 1 =\n\n===== 5 =====\n\n== 2 ==\n");
-add("html2wt", "ISBN with space-delimited number",
"[[wiki/Special:BookSources/9290170328|ISBN 92 9017 032 8]]\n");
add("html2wt", "ISBN length", "ISBN
123456789\n\n[[wiki/Special:BookSources/1234567890|ISBN 1234567890]]\n\nISBN
12345678901\n");
add("html2wt", "ISBN with trailing year (T9110)",
"[[wiki/Special:BookSources/1234567890|ISBN 1-234-56789-0]] -
2006\n\n[[wiki/Special:BookSources/1234567890|ISBN 1 234 56789 0]] - 2006\n");
add("html2wt", "anchorencode", "foo_bar.C2.A9.23.25n\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 13fce4e..33016cb 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -20356,9 +20356,11 @@
ISBN with space-delimited number
!! wikitext
ISBN 92 9017 032 8
-!! html
+!! html/php
<p><a href="/wiki/Special:BookSources/9290170328" class="internal
mw-magiclink-isbn">ISBN 92 9017 032 8</a>
</p>
+!! html/parsoid
+<p data-parsoid='{"dsr":[0,18,0,0]}'><a
href="./Special:BookSources/9290170328" rel="mw:WikiLink"
data-parsoid='{"stx":"magiclink","dsr":[0,18,2,2]}'>ISBN 92 9017 032 8</a></p>
!! end
--
To view, visit https://gerrit.wikimedia.org/r/351726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26571b500dad45825145c692586e71fa2e9bd45d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
