Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310046
Change subject: Add some parsoid sections for category tests
......................................................................
Add some parsoid sections for category tests
Change-Id: I97886b5349752086fc33fd8cd890e2d3bafefbda
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 12 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/46/310046/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 4f2e54b..dab2091 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -143,10 +143,7 @@
add("wt2html", "Image with link parameter, wgNoFollowDomainExceptions", "<p
data-parsoid='{\"dsr\":[0,45,0,0]}'><span class=\"mw-default-size\"
typeof=\"mw:Image\"
data-parsoid='{\"optList\":[{\"ck\":\"link\",\"ak\":\"link=http://example.com/\"}],\"dsr\":[0,45,null,null]}'><a
href=\"http://example.com/\"; data-parsoid=\"{}\"><img
resource=\"./File:Foobar.jpg\" src=\"//example.com/images/3/3a/Foobar.jpg\"
data-file-width=\"1941\" data-file-height=\"220\" data-file-type=\"bitmap\"
height=\"220\" width=\"1941\"
data-parsoid='{\"a\":{\"resource\":\"./File:Foobar.jpg\",\"height\":\"220\",\"width\":\"1941\"},\"sa\":{\"resource\":\"Image:foobar.jpg\"}}'/></a></span></p>");
add("wt2html", "SVG thumbnails with invalid language code", "<figure
class=\"mw-default-size\" typeof=\"mw:Image/Thumb\"
data-parsoid='{\"optList\":[{\"ck\":\"thumbnail\",\"ak\":\"thumb\"},{\"ck\":\"caption\",\"ak\":\"caption\"},{\"ck\":\"lang\",\"ak\":\"lang=invalid.language.code\"}],\"dsr\":[0,60,2,2]}'><a
href=\"./File:Foobar.svg\"
data-parsoid='{\"a\":{\"href\":\"./File:Foobar.svg\"},\"sa\":{},\"dsr\":[2,null,null,null]}'><img
resource=\"./File:Foobar.svg\"
src=\"//example.com/images/thumb/f/ff/Foobar.svg/220px-Foobar.svg\"
lang=\"invalid.language.code\" data-file-width=\"240\" data-file-height=\"180\"
data-file-type=\"drawing\" height=\"165\" width=\"220\"
data-parsoid='{\"a\":{\"resource\":\"./File:Foobar.svg\",\"lang\":\"invalid.language.code\",\"height\":\"165\",\"width\":\"220\"},\"sa\":{\"resource\":\"File:Foobar.svg\",\"lang\":\"lang=invalid.language.code\"}}'/></a><figcaption
data-parsoid='{\"dsr\":[null,58,null,null]}'>caption</figcaption></figure>");
add("wt2html", "BUG 561: {{/Subpage}}", "<p
data-parsoid='{\"dsr\":[0,12,0,0]}'><span typeof=\"mw:Transclusion
mw:Placeholder\" about=\"#mwt1\"
data-parsoid='{\"dsr\":[0,12,null,null],\"pi\":[[]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"/Subpage\",\"href\":\"./Page/Subpage\"},\"params\":{},\"i\":0}}]}'>Warning:
Page/template fetching disabled, and no cache for Page/Subpage</span></p>");
-add("wt2html", "Simple category", "<link rel=\"mw:PageProp/Category\"
href=\"./Category:MediaWiki_User's_Guide\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Category:MediaWiki_User's_Guide\"},\"sa\":{\"href\":\"Category:MediaWiki
User's Guide\"},\"dsr\":[0,35,null,null]}'/>");
add("wt2html", "PAGESINCATEGORY invalid title fatal (r33546 fix)", "<p
about=\"#mwt1\" typeof=\"mw:Transclusion\"
data-parsoid='{\"dsr\":[0,27,0,0],\"pi\":[[]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"PAGESINCATEGORY:<bogus>\",\"function\":\"pagesincategory\"},\"params\":{},\"i\":0}}]}'>Parser
function implementation for pf_pagesincategory missing in Parsoid.</p>");
-add("wt2html", "Category with different sort key", "<link
rel=\"mw:PageProp/Category\" href=\"./Category:MediaWiki_User's_Guide#Foo\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Category:MediaWiki_User's_Guide\"},\"sa\":{\"href\":\"Category:MediaWiki
User's Guide\"},\"dsr\":[0,39,null,null]}'/>");
-add("wt2html", "Category with identical sort key", "<link
rel=\"mw:PageProp/Category\"
href=\"./Category:MediaWiki_User's_Guide#MediaWiki%20User's%20Guide\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Category:MediaWiki_User's_Guide\"},\"sa\":{\"href\":\"Category:MediaWiki
User's Guide\"},\"dsr\":[0,58,null,null]}'/>");
add("wt2html", "Parsoid: Defaultsort (template-generated)", "<meta
property=\"mw:PageProp/categorydefaultsort\" content=\"Foo\" about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"dsr\":[0,28,null,null],\"pi\":[[]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"{{echo|DEFAULTSORT}}:Foo\",\"href\":\"./Foo\"},\"params\":{},\"i\":0}}]}'/>");
add("wt2html", "Short headings with trailing space should match behavior of
Parser::doHeadings (bug 19910)", "<p data-parsoid='{\"dsr\":[0,100,0,0]}'>===
\nThe line above must have a trailing space!\n=== <!--\n--> <!-- -->\nBut just
in case it doesn't...</p>");
add("wt2html", "Header with space, plus and underscore as entity", "<p
data-parsoid='{\"dsr\":[0,34,0,0]}'>Id should not contain + for
spaces</p>\n\n<h2 data-parsoid='{\"dsr\":[36,60,2,2]}'> Space between Text
</h2>\n<p data-parsoid='{\"dsr\":[61,70,0,0]}'>section 1</p>\n\n<h2
data-parsoid='{\"dsr\":[72,111,2,2]}'> Space-Entity<span typeof=\"mw:Entity\"
data-parsoid='{\"src\":\"&#32;\",\"srcContent\":\"
\",\"dsr\":[87,92,null,null]}'> </span>between<span typeof=\"mw:Entity\"
data-parsoid='{\"src\":\"&#32;\",\"srcContent\":\"
\",\"dsr\":[99,104,null,null]}'> </span>Text </h2>\n<p
data-parsoid='{\"dsr\":[112,121,0,0]}'>section 2</p>\n\n<h2
data-parsoid='{\"dsr\":[123,146,2,2]}'> Plus+between+Text </h2>\n<p
data-parsoid='{\"dsr\":[147,156,0,0]}'>section 3</p>\n\n<h2
data-parsoid='{\"dsr\":[158,196,2,2]}'> Plus-Entity<span typeof=\"mw:Entity\"
data-parsoid='{\"src\":\"&#43;\",\"srcContent\":\"+\",\"dsr\":[172,177,null,null]}'>+</span>between<span
typeof=\"mw:Entity\"
data-parsoid='{\"src\":\"&#43;\",\"srcContent\":\"+\",\"dsr\":[184,189,null,null]}'>+</span>Text
</h2>\n<p data-parsoid='{\"dsr\":[197,206,0,0]}'>section 4</p>\n\n<h2
data-parsoid='{\"dsr\":[208,237,2,2]}'> Underscore_between_Text </h2>\n<p
data-parsoid='{\"dsr\":[238,247,0,0]}'>section 5</p>\n\n<h2
data-parsoid='{\"dsr\":[249,293,2,2]}'> Underscore-Entity<span
typeof=\"mw:Entity\"
data-parsoid='{\"src\":\"&#95;\",\"srcContent\":\"_\",\"dsr\":[269,274,null,null]}'>_</span>between<span
typeof=\"mw:Entity\"
data-parsoid='{\"src\":\"&#95;\",\"srcContent\":\"_\",\"dsr\":[281,286,null,null]}'>_</span>Text
</h2>\n<p data-parsoid='{\"dsr\":[294,303,0,0]}'>section 6</p>\n\n<p
data-parsoid='{\"dsr\":[305,501,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Main_Page#Space_between_Text\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Main_Page#Space_between_Text\"},\"sa\":{\"href\":\"#Space
between Text\"},\"dsr\":[305,328,2,2]}'>#Space between Text</a>\n<a
rel=\"mw:WikiLink\" href=\"./Main_Page#Space-Entity_between_Text\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Main_Page#Space-Entity_between_Text\"},\"sa\":{\"href\":\"#Space-Entity&#32;between&#32;Text\"},\"dsr\":[329,367,2,2]}'>#Space-Entity
between Text</a>\n<a rel=\"mw:WikiLink\"
href=\"./Main_Page#Plus+between+Text\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Main_Page#Plus+between+Text\"},\"sa\":{\"href\":\"#Plus+between+Text\"},\"dsr\":[368,390,2,2]}'>#Plus+between+Text</a>\n<a
rel=\"mw:WikiLink\" href=\"./Main_Page#Plus-Entity+between+Text\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Main_Page#Plus-Entity+between+Text\"},\"sa\":{\"href\":\"#Plus-Entity&#43;between&#43;Text\"},\"dsr\":[391,428,2,2]}'>#Plus-Entity+between+Text</a>\n<a
rel=\"mw:WikiLink\" href=\"./Main_Page#Underscore_between_Text\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Main_Page#Underscore_between_Text\"},\"sa\":{\"href\":\"#Underscore_between_Text\"},\"dsr\":[429,457,2,2]}'>#Underscore_between_Text</a>\n<a
rel=\"mw:WikiLink\" href=\"./Main_Page#Underscore-Entity_between_Text\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Main_Page#Underscore-Entity_between_Text\"},\"sa\":{\"href\":\"#Underscore-Entity&#95;between&#95;Text\"},\"dsr\":[458,501,2,2]}'>#Underscore-Entity_between_Text</a></p>");
@@ -211,7 +208,6 @@
add("wt2html", "Simple template in language variants", "<p
data-parsoid='{\"dsr\":[0,8,0,0]}'><span typeof=\"mw:Transclusion
mw:Placeholder\" about=\"#mwt1\"
data-parsoid='{\"dsr\":[0,8,null,null],\"pi\":[[]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"тест\",\"href\":\"./Шаблон:Тест\"},\"params\":{},\"i\":0}}]}'>Warning:
Page/template fetching disabled, and no cache for Шаблон:Тест</span></p>");
add("wt2html", "Template with explicit namespace in language variants", "<p
data-parsoid='{\"dsr\":[0,17,0,0]}'><span typeof=\"mw:Transclusion
mw:Placeholder\" about=\"#mwt1\"
data-parsoid='{\"dsr\":[0,17,null,null],\"pi\":[[]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"Template:тест\",\"href\":\"./Шаблон:Тест\"},\"params\":{},\"i\":0}}]}'>Warning:
Page/template fetching disabled, and no cache for Шаблон:Тест</span></p>");
add("wt2html", "Basic test for template parameter in language variants", "<p
data-parsoid='{\"dsr\":[0,23,0,0]}'><span typeof=\"mw:Transclusion
mw:Placeholder\" about=\"#mwt1\"
data-parsoid='{\"dsr\":[0,23,null,null],\"pi\":[[{\"k\":\"param\",\"named\":true}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"парамтест\",\"href\":\"./Шаблон:Парамтест\"},\"params\":{\"param\":{\"wt\":\"foo\"}},\"i\":0}}]}'>Warning:
Page/template fetching disabled, and no cache for
Шаблон:Парамтест</span></p>");
-add("wt2html", "Simple category in language variants", "<link
rel=\"mw:PageProp/Category\" href=\"./Категорија:МедиаWики_Усер'с_Гуиде\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Категорија:МедиаWики_Усер'с_Гуиде\"},\"sa\":{\"href\":\"Category:МедиаWики
Усер'с Гуиде\"},\"dsr\":[0,35,null,null]}'/>");
add("wt2html", "Stripping -{}- tags (language variants)", "<p
data-parsoid='{\"dsr\":[0,36,0,0]}'>Latin proverb: -{Ne nuntium necare}-</p>");
add("wt2html", "Prevent conversion with -{}- tags (language variants)", "<p
data-parsoid='{\"dsr\":[0,31,0,0]}'>Latinski: -{Ne nuntium necare}-</p>");
add("wt2html", "Prevent conversion of text with -{}- tags (language
variants)", "<p data-parsoid='{\"dsr\":[0,31,0,0]}'>Latinski: -{Ne nuntium
necare}-</p>");
@@ -504,9 +500,6 @@
add("html2html", "Disabled subpages", "<p
data-parsoid='{\"dsr\":[0,58,0,0]}'>[/index.php?title=/subpage&action=edit&redlink=1
/subpage]</p>\n");
add("html2html", "BUG 561: {{/Subpage}}", "<p
data-parsoid='{\"dsr\":[0,66,0,0]}'>[/index.php?title=Page/Subpage&action=edit&redlink=1
Page/Subpage]</p>\n");
add("html2html", "Link to category", "<p
data-parsoid='{\"dsr\":[0,72,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Category:MediaWiki_User's_Guide\" title=\"Wiki/Category:MediaWiki
User's Guide\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Category:MediaWiki_User's_Guide\"},\"sa\":{\"href\":\"wiki/Category:MediaWiki
User's Guide\"},\"dsr\":[0,72,39,2]}'>Category:MediaWiki User's
Guide</a></p>\n");
-add("html2html", "Simple category", "<p
data-parsoid='{\"dsr\":[0,32,0,0]}'>cat=MediaWiki_User's_Guide sort=</p>");
-add("html2html", "Category with different sort key", "<p
data-parsoid='{\"dsr\":[0,35,0,0]}'>cat=MediaWiki_User's_Guide sort=Foo</p>");
-add("html2html", "Category with identical sort key", "<p
data-parsoid='{\"dsr\":[0,54,0,0]}'>cat=MediaWiki_User's_Guide sort=MediaWiki
User's Guide</p>");
add("html2html", "Parsoid: Defaultsort (template-generated)", "<meta
property=\"mw:PageProp/categorydefaultsort\" content=\"Foo\" about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"dsr\":[0,28,null,null],\"pi\":[[]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"{{echo|DEFAULTSORT}}:Foo\",\"href\":\"./Foo\"},\"params\":{},\"i\":0}}]}'/>");
add("html2html", "Section headings with TOC", "<div id=\"toc\" class=\"toc\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,691,26,6]}'><div id=\"toctitle\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[26,67,19,6]}'>\n<h2
data-parsoid='{\"dsr\":[46,60,2,2]}'> Contents </h2>\n</div>\n\n<ul
data-parsoid='{\"dsr\":[69,159,0,0]}'><li
data-parsoid='{\"dsr\":[69,159,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Headline_1\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Headline_1\"},\"sa\":{\"href\":\"#Headline_1\"},\"dsr\":[71,159,14,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[85,117,24,7]}'>1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[118,157,22,7]}'>Headline
1</span></a></li></ul>\n\n<ul data-parsoid='{\"dsr\":[161,260,0,0]}'><li
data-parsoid='{\"dsr\":[161,260,1,0]}'><ul
data-parsoid='{\"dsr\":[162,260,0,0]}'><li
data-parsoid='{\"dsr\":[162,260,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Subheadline_1\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Subheadline_1\"},\"sa\":{\"href\":\"#Subheadline_1\"},\"dsr\":[164,260,17,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[181,215,24,7]}'>1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[216,258,22,7]}'>Subheadline
1</span></a></li></ul></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[262,370,0,0]}'><li
data-parsoid='{\"dsr\":[262,370,1,0]}'><ul
data-parsoid='{\"dsr\":[263,370,0,0]}'><li
data-parsoid='{\"dsr\":[263,370,1,0]}'><ul
data-parsoid='{\"dsr\":[264,370,0,0]}'><li
data-parsoid='{\"dsr\":[264,370,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Skipping_a_level\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Skipping_a_level\"},\"sa\":{\"href\":\"#Skipping_a_level\"},\"dsr\":[266,370,20,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[286,322,24,7]}'>1.1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[323,368,22,7]}'>Skipping a
level</span></a></li></ul></li></ul></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[372,576,0,0]}'><li
data-parsoid='{\"dsr\":[372,485,1,0]}'><ul
data-parsoid='{\"dsr\":[373,485,0,0]}'><li
data-parsoid='{\"dsr\":[373,485,1,0]}'><ul
data-parsoid='{\"dsr\":[374,485,0,0]}'><li
data-parsoid='{\"dsr\":[374,485,1,0]}'><ul
data-parsoid='{\"dsr\":[375,485,0,0]}'><li
data-parsoid='{\"dsr\":[375,485,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Skipping_a_level_2\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Skipping_a_level_2\"},\"sa\":{\"href\":\"#Skipping_a_level_2\"},\"dsr\":[377,485,22,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[399,437,24,7]}'>1.1.1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[438,483,22,7]}'>Skipping a
level</span></a></li></ul></li></ul></li></ul></li>\n<li
data-parsoid='{\"dsr\":[486,576,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Headline_2\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Headline_2\"},\"sa\":{\"href\":\"#Headline_2\"},\"dsr\":[488,576,14,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[502,534,24,7]}'>2</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[535,574,22,7]}'>Headline
2</span></a></li></ul>\n\n<ul data-parsoid='{\"dsr\":[578,683,0,0]}'><li
data-parsoid='{\"dsr\":[578,683,1,0]}'><ul
data-parsoid='{\"dsr\":[579,683,0,0]}'><li
data-parsoid='{\"dsr\":[579,683,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Another_headline\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Another_headline\"},\"sa\":{\"href\":\"#Another_headline\"},\"dsr\":[581,683,20,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[601,635,24,7]}'>2.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[636,681,22,7]}'>Another
headline</span></a></li></ul></li></ul>\n\n</div>\n\n<h2
data-parsoid='{\"dsr\":[693,709,2,2]}'> Headline 1 </h2>\n\n<h3
data-parsoid='{\"dsr\":[711,732,3,3]}'> Subheadline 1 </h3>\n\n<h5
data-parsoid='{\"dsr\":[734,762,5,5]}'> Skipping a level </h5>\n\n<h6
data-parsoid='{\"dsr\":[764,794,6,6]}'> Skipping a level </h6>\n\n<h2
data-parsoid='{\"dsr\":[796,812,2,2]}'> Headline 2 </h2>\n<p
data-parsoid='{\"dsr\":[813,822,0,0]}'>Some text</p>\n\n<h3
data-parsoid='{\"dsr\":[824,848,3,3]}'> Another headline </h3>\n");
add("html2html", "Handling of sections up to level 6 and beyond", "<div
id=\"toc\" class=\"toc\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,1286,26,6]}'><div id=\"toctitle\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[26,67,19,6]}'>\n<h2
data-parsoid='{\"dsr\":[46,60,2,2]}'> Contents </h2>\n</div>\n\n<ul
data-parsoid='{\"dsr\":[69,169,0,0]}'><li
data-parsoid='{\"dsr\":[69,169,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Level_1_Heading\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Level_1_Heading\"},\"sa\":{\"href\":\"#Level_1_Heading\"},\"dsr\":[71,169,19,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[90,122,24,7]}'>1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[123,167,22,7]}'>Level 1
Heading</span></a></li></ul>\n\n<ul data-parsoid='{\"dsr\":[171,274,0,0]}'><li
data-parsoid='{\"dsr\":[171,274,1,0]}'><ul
data-parsoid='{\"dsr\":[172,274,0,0]}'><li
data-parsoid='{\"dsr\":[172,274,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Level_2_Heading\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Level_2_Heading\"},\"sa\":{\"href\":\"#Level_2_Heading\"},\"dsr\":[174,274,19,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[193,227,24,7]}'>1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[228,272,22,7]}'>Level 2
Heading</span></a></li></ul></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[276,382,0,0]}'><li
data-parsoid='{\"dsr\":[276,382,1,0]}'><ul
data-parsoid='{\"dsr\":[277,382,0,0]}'><li
data-parsoid='{\"dsr\":[277,382,1,0]}'><ul
data-parsoid='{\"dsr\":[278,382,0,0]}'><li
data-parsoid='{\"dsr\":[278,382,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Level_3_Heading\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Level_3_Heading\"},\"sa\":{\"href\":\"#Level_3_Heading\"},\"dsr\":[280,382,19,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[299,335,24,7]}'>1.1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[336,380,22,7]}'>Level 3
Heading</span></a></li></ul></li></ul></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[384,493,0,0]}'><li
data-parsoid='{\"dsr\":[384,493,1,0]}'><ul
data-parsoid='{\"dsr\":[385,493,0,0]}'><li
data-parsoid='{\"dsr\":[385,493,1,0]}'><ul
data-parsoid='{\"dsr\":[386,493,0,0]}'><li
data-parsoid='{\"dsr\":[386,493,1,0]}'><ul
data-parsoid='{\"dsr\":[387,493,0,0]}'><li
data-parsoid='{\"dsr\":[387,493,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Level_4_Heading\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Level_4_Heading\"},\"sa\":{\"href\":\"#Level_4_Heading\"},\"dsr\":[389,493,19,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[408,446,24,7]}'>1.1.1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[447,491,22,7]}'>Level 4
Heading</span></a></li></ul></li></ul></li></ul></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[495,607,0,0]}'><li
data-parsoid='{\"dsr\":[495,607,1,0]}'><ul
data-parsoid='{\"dsr\":[496,607,0,0]}'><li
data-parsoid='{\"dsr\":[496,607,1,0]}'><ul
data-parsoid='{\"dsr\":[497,607,0,0]}'><li
data-parsoid='{\"dsr\":[497,607,1,0]}'><ul
data-parsoid='{\"dsr\":[498,607,0,0]}'><li
data-parsoid='{\"dsr\":[498,607,1,0]}'><ul
data-parsoid='{\"dsr\":[499,607,0,0]}'><li
data-parsoid='{\"dsr\":[499,607,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Level_5_Heading\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Level_5_Heading\"},\"sa\":{\"href\":\"#Level_5_Heading\"},\"dsr\":[501,607,19,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[520,560,24,7]}'>1.1.1.1.1</span> <span
class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[561,605,22,7]}'>Level 5
Heading</span></a></li></ul></li></ul></li></ul></li></ul></li></ul>\n\n<ul
data-parsoid='{\"dsr\":[609,1278,0,0]}'><li
data-parsoid='{\"dsr\":[609,1278,1,0]}'><ul
data-parsoid='{\"dsr\":[610,1278,0,0]}'><li
data-parsoid='{\"dsr\":[610,1278,1,0]}'><ul
data-parsoid='{\"dsr\":[611,1278,0,0]}'><li
data-parsoid='{\"dsr\":[611,1278,1,0]}'><ul
data-parsoid='{\"dsr\":[612,1278,0,0]}'><li
data-parsoid='{\"dsr\":[612,1278,1,0]}'><ul
data-parsoid='{\"dsr\":[613,1278,0,0]}'><li
data-parsoid='{\"dsr\":[613,1278,1,0]}'><ul
data-parsoid='{\"dsr\":[614,1278,0,0]}'><li
data-parsoid='{\"dsr\":[614,724,1,0]}'> <a rel=\"mw:WikiLink\"
href=\"./Main_Page#Level_6_Heading\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#Level_6_Heading\"},\"sa\":{\"href\":\"#Level_6_Heading\"},\"dsr\":[616,724,19,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[635,677,24,7]}'>1.1.1.1.1.1</span>
<span class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[678,722,22,7]}'>Level 6
Heading</span></a></li>\n<li data-parsoid='{\"dsr\":[725,850,6,0]}'> <a
rel=\"mw:WikiLink\" href=\"./Main_Page#.3D_Level_7_Heading.3D\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#.3D_Level_7_Heading.3D\"},\"sa\":{\"href\":\"#.3D_Level_7_Heading.3D\"},\"dsr\":[732,850,26,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[758,800,24,7]}'>1.1.1.1.1.2</span>
<span class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[801,848,22,7]}'>= Level 7
Heading=</span></a></li>\n<li data-parsoid='{\"dsr\":[851,984,6,0]}'> <a
rel=\"mw:WikiLink\" href=\"./Main_Page#.3D.3D_Level_8_Heading.3D.3D\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#.3D.3D_Level_8_Heading.3D.3D\"},\"sa\":{\"href\":\"#.3D.3D_Level_8_Heading.3D.3D\"},\"dsr\":[858,984,32,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[890,932,24,7]}'>1.1.1.1.1.3</span>
<span class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[933,982,22,7]}'>== Level 8
Heading==</span></a></li>\n<li data-parsoid='{\"dsr\":[985,1126,6,0]}'> <a
rel=\"mw:WikiLink\" href=\"./Main_Page#.3D.3D.3D_Level_9_Heading.3D.3D.3D\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#.3D.3D.3D_Level_9_Heading.3D.3D.3D\"},\"sa\":{\"href\":\"#.3D.3D.3D_Level_9_Heading.3D.3D.3D\"},\"dsr\":[992,1126,38,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[1030,1072,24,7]}'>1.1.1.1.1.4</span>
<span class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[1073,1124,22,7]}'>=== Level 9
Heading===</span></a></li>\n<li data-parsoid='{\"dsr\":[1127,1278,6,0]}'> <a
rel=\"mw:WikiLink\"
href=\"./Main_Page#.3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Main_Page#.3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D\"},\"sa\":{\"href\":\"#.3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D\"},\"dsr\":[1134,1278,45,2]}'><span
class=\"tocnumber\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[1179,1221,24,7]}'>1.1.1.1.1.5</span>
<span class=\"toctext\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[1222,1276,22,7]}'>==== Level 10
Heading====</span></a></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul>\n\n</div>\n\n<h1
data-parsoid='{\"dsr\":[1288,1307,1,1]}'> Level 1 Heading </h1>\n\n<h2
data-parsoid='{\"dsr\":[1309,1330,2,2]}'> Level 2 Heading </h2>\n\n<h3
data-parsoid='{\"dsr\":[1332,1355,3,3]}'> Level 3 Heading </h3>\n\n<h4
data-parsoid='{\"dsr\":[1357,1382,4,4]}'> Level 4 Heading </h4>\n\n<h5
data-parsoid='{\"dsr\":[1384,1411,5,5]}'> Level 5 Heading </h5>\n\n<h6
data-parsoid='{\"dsr\":[1413,1442,6,6]}'> Level 6 Heading </h6>\n\n<h6
data-parsoid='{\"dsr\":[1444,1476,6,6]}'> = Level 7 Heading= </h6>\n\n<h6
data-parsoid='{\"dsr\":[1478,1512,6,6]}'> == Level 8 Heading== </h6>\n\n<h6
data-parsoid='{\"dsr\":[1514,1550,6,6]}'> === Level 9 Heading=== </h6>\n\n<h6
data-parsoid='{\"dsr\":[1552,1591,6,6]}'> ==== Level 10 Heading==== </h6>\n");
@@ -579,7 +572,6 @@
add("html2html", "Link to a section of a variant of this title shouldn't be
parsed as self-link", "<p data-parsoid='{\"dsr\":[0,129,0,0]}'><strong
class=\"selflink\"
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,38,25,9]}'>Dуна</strong> is a
self-link while <a rel=\"mw:WikiLink\" href=\"./Wiki/Дуна\" title=\"Wiki/Дуна\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Дуна\"},\"sa\":{\"href\":\"wiki/Дуна\"},\"dsr\":[60,82,12,2]}'>Dunа#Foo</a>
and <a rel=\"mw:WikiLink\" href=\"./Wiki/Дуна\" title=\"Wiki/Дуна\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Дуна\"},\"sa\":{\"href\":\"wiki/Дуна\"},\"dsr\":[87,109,12,2]}'>Dуна#Foo</a>
are not self-links.</p>\n");
add("html2html", "Link to pages in language variants", "<p
data-parsoid='{\"dsr\":[0,56,0,0]}'>Main Page can be written as <a
rel=\"mw:WikiLink\" href=\"./Wiki/Main_Page\" title=\"Wiki/Main Page\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Main_Page\"},\"sa\":{\"href\":\"wiki/Main
Page\"},\"dsr\":[28,56,17,2]}'>Маин Паге</a></p>\n");
add("html2html", "Multiple links to pages in language variants", "<p
data-parsoid='{\"dsr\":[0,113,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Main_Page\" title=\"Wiki/Main Page\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Main_Page\"},\"sa\":{\"href\":\"wiki/Main
Page\"},\"dsr\":[0,28,17,2]}'>Main Page</a> can be written as <a
rel=\"mw:WikiLink\" href=\"./Wiki/Main_Page\" title=\"Wiki/Main Page\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Main_Page\"},\"sa\":{\"href\":\"wiki/Main
Page\"},\"dsr\":[47,75,17,2]}'>Маин Паге</a> same as <a rel=\"mw:WikiLink\"
href=\"./Wiki/Main_Page\" title=\"Wiki/Main Page\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Main_Page\"},\"sa\":{\"href\":\"wiki/Main
Page\"},\"dsr\":[84,112,17,2]}'>Маин Паге</a>.</p>\n");
-add("html2html", "Simple category in language variants", "<p
data-parsoid='{\"dsr\":[0,32,0,0]}'>cat=МедиаWики_Усер'с_Гуиде sort=</p>");
add("html2html", "Prevent conversion of links with -{}- tags (language
variants)", "<p data-parsoid='{\"dsr\":[0,28,0,0]}'><a rel=\"mw:WikiLink\"
href=\"./Wiki/Main_Page\" title=\"Wiki/Main Page\"
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Main_Page\"},\"sa\":{\"href\":\"wiki/Main
Page\"},\"dsr\":[0,28,17,2]}'>Main Page</a></p>\n");
add("html2html", "Adding explicit conversion rule for title (T flag)", "<p
data-parsoid='{\"dsr\":[0,6,0,0]}'>Taiwan</p>\n\n<p
data-parsoid='{\"dsr\":[8,27,0,0]}'>Should be stripped!</p>\n");
add("html2html", "Testing that changing the language variant here in the tests
actually works", "<p data-parsoid='{\"dsr\":[0,5,0,0]}'>China</p>\n\n<p
data-parsoid='{\"dsr\":[7,26,0,0]}'>Should be stripped!</p>\n");
@@ -1034,10 +1026,7 @@
add("html2wt", "Disabled subpages",
"[/index.php?title=/subpage&action=edit&redlink=1 /subpage]\n");
add("html2wt", "BUG 561: {{/Subpage}}",
"[/index.php?title=Page/Subpage&action=edit&redlink=1 Page/Subpage]\n");
add("html2wt", "Link to category", "[[wiki/Category:MediaWiki User's
Guide|Category:MediaWiki User's Guide]]\n");
-add("html2wt", "Simple category", "cat=MediaWiki_User's_Guide sort=");
add("html2wt", "PAGESINCATEGORY invalid title fatal (r33546 fix)", "0\n");
-add("html2wt", "Category with different sort key", "cat=MediaWiki_User's_Guide
sort=Foo");
-add("html2wt", "Category with identical sort key", "cat=MediaWiki_User's_Guide
sort=MediaWiki User's Guide");
add("html2wt", "Basic section headings", "== Headline 1 ==\nSome text\n\n==
Headline 2 ==\nMore\n\n=== Smaller headline ===\nBlah blah\n");
add("html2wt", "Section headings with TOC", "<div id=\"toc\"
class=\"toc\"><div id=\"toctitle\">\n== Contents ==\n</div>\n\n*
[[#Headline_1|<span class=\"tocnumber\">1</span> <span
class=\"toctext\">Headline 1</span>]]\n\n** [[#Subheadline_1|<span
class=\"tocnumber\">1.1</span> <span class=\"toctext\">Subheadline
1</span>]]\n\n*** [[#Skipping_a_level|<span class=\"tocnumber\">1.1.1</span>
<span class=\"toctext\">Skipping a level</span>]]\n\n****
[[#Skipping_a_level_2|<span class=\"tocnumber\">1.1.1.1</span> <span
class=\"toctext\">Skipping a level</span>]]\n* [[#Headline_2|<span
class=\"tocnumber\">2</span> <span class=\"toctext\">Headline 2</span>]]\n\n**
[[#Another_headline|<span class=\"tocnumber\">2.1</span> <span
class=\"toctext\">Another headline</span>]]\n\n</div>\n\n== Headline 1
==\n\n=== Subheadline 1 ===\n\n===== Skipping a level =====\n\n====== Skipping
a level ======\n\n== Headline 2 ==\nSome text\n\n=== Another headline ===\n");
add("html2wt", "Handling of sections up to level 6 and beyond", "<div
id=\"toc\" class=\"toc\"><div id=\"toctitle\">\n== Contents ==\n</div>\n\n*
[[#Level_1_Heading|<span class=\"tocnumber\">1</span> <span
class=\"toctext\">Level 1 Heading</span>]]\n\n** [[#Level_2_Heading|<span
class=\"tocnumber\">1.1</span> <span class=\"toctext\">Level 2
Heading</span>]]\n\n*** [[#Level_3_Heading|<span
class=\"tocnumber\">1.1.1</span> <span class=\"toctext\">Level 3
Heading</span>]]\n\n**** [[#Level_4_Heading|<span
class=\"tocnumber\">1.1.1.1</span> <span class=\"toctext\">Level 4
Heading</span>]]\n\n***** [[#Level_5_Heading|<span
class=\"tocnumber\">1.1.1.1.1</span> <span class=\"toctext\">Level 5
Heading</span>]]\n\n****** [[#Level_6_Heading|<span
class=\"tocnumber\">1.1.1.1.1.1</span> <span class=\"toctext\">Level 6
Heading</span>]]\n****** [[#.3D_Level_7_Heading.3D|<span
class=\"tocnumber\">1.1.1.1.1.2</span> <span class=\"toctext\">= Level 7
Heading=</span>]]\n****** [[#.3D.3D_Level_8_Heading.3D.3D|<span
class=\"tocnumber\">1.1.1.1.1.3</span> <span class=\"toctext\">== Level 8
Heading==</span>]]\n****** [[#.3D.3D.3D_Level_9_Heading.3D.3D.3D|<span
class=\"tocnumber\">1.1.1.1.1.4</span> <span class=\"toctext\">=== Level 9
Heading===</span>]]\n****** [[#.3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D|<span
class=\"tocnumber\">1.1.1.1.1.5</span> <span class=\"toctext\">==== Level 10
Heading====</span>]]\n\n</div>\n\n= Level 1 Heading =\n\n== Level 2 Heading
==\n\n=== Level 3 Heading ===\n\n==== Level 4 Heading ====\n\n===== Level 5
Heading =====\n\n====== Level 6 Heading ======\n\n====== = Level 7 Heading=
======\n\n====== == Level 8 Heading== ======\n\n====== === Level 9 Heading===
======\n\n====== ==== Level 10 Heading==== ======\n");
@@ -1178,7 +1167,6 @@
add("html2wt", "Simple template in language variants", "This is a test
template\n");
add("html2wt", "Template with explicit namespace in language variants", "This
is a test template\n");
add("html2wt", "Basic test for template parameter in language variants", "This
is a test template with parameter foo\n");
-add("html2wt", "Simple category in language variants",
"cat=МедиаWики_Усер'с_Гуиде sort=");
add("html2wt", "Stripping -{}- tags (language variants)", "Latin proverb: Ne
nuntium necare\n");
add("html2wt", "Prevent conversion with -{}- tags (language variants)",
"Латински: Ne nuntium necare\n");
add("html2wt", "Prevent conversion of text with -{}- tags (language
variants)", "Латински: Ne nuntium necare\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index e1a54fb..c110444 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -14710,8 +14710,10 @@
cat
!! wikitext
[[Category:MediaWiki User's Guide]]
-!! html
+!! html/php
cat=MediaWiki_User's_Guide sort=
+!! html/parsoid
+<link rel="mw:PageProp/Category" href="./Category:MediaWiki_User's_Guide"
data-parsoid='{"stx":"simple","a":{"href":"./Category:MediaWiki_User's_Guide"},"sa":{"href":"Category:MediaWiki
User's Guide"}}'/>
!! end
!! test
@@ -14729,8 +14731,10 @@
cat
!! wikitext
[[Category:MediaWiki User's Guide|Foo]]
-!! html
+!! html/php
cat=MediaWiki_User's_Guide sort=Foo
+!! html/parsoid
+<link rel="mw:PageProp/Category" href="./Category:MediaWiki_User's_Guide#Foo"
data-parsoid='{"stx":"piped","a":{"href":"./Category:MediaWiki_User's_Guide"},"sa":{"href":"Category:MediaWiki
User's Guide"}}'/>
!! end
!! test
@@ -14739,8 +14743,10 @@
cat
!! wikitext
[[Category:MediaWiki User's Guide|MediaWiki User's Guide]]
-!! html
+!! html/php
cat=MediaWiki_User's_Guide sort=MediaWiki User's Guide
+!! html/parsoid
+<link rel="mw:PageProp/Category"
href="./Category:MediaWiki_User's_Guide#MediaWiki%20User's%20Guide"
data-parsoid='{"stx":"piped","a":{"href":"./Category:MediaWiki_User's_Guide"},"sa":{"href":"Category:MediaWiki
User's Guide"}}'/>
!! end
!! test
@@ -14765,22 +14771,15 @@
[[Category:Foo (bar)|Foo]]
!! end
-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.
!! test
Category with link tail
!! options
cat
pst
-parsoid=wt2html
!! wikitext
123[[Category:Foo]]456
!! html/php
123[[Category:Foo]]456
-!! html/parsoid
-<p>123<link rel="mw:PageProp/Category" href="Category:Foo"/>456</p>
!! end
!! test
@@ -19844,17 +19843,17 @@
</p>
!! end
-
!! test
Simple category in language variants
!! options
language=sr cat
!! wikitext
[[Category:МедиаWики Усер'с Гуиде]]
-!! html
+!! html/php
cat=МедиаWики_Усер'с_Гуиде sort=
+!! html/parsoid
+<link rel="mw:PageProp/Category" href="./Категорија:МедиаWики_Усер'с_Гуиде"
data-parsoid='{"stx":"simple","a":{"href":"./Категорија:МедиаWики_Усер'с_Гуиде"},"sa":{"href":"Category:МедиаWики
Усер'с Гуиде"}}'/>
!! end
-
!! article
Category:分类
--
To view, visit https://gerrit.wikimedia.org/r/310046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97886b5349752086fc33fd8cd890e2d3bafefbda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
