jenkins-bot has submitted this change and it was merged. Change subject: Update parserTests.txt to latest from mediawiki/core. ......................................................................
Update parserTests.txt to latest from mediawiki/core. The latest upstream parser tests have 5 new tests (3 Parsoid serializer, 2 parser) & fixed 4 tests ( https://gerrit.wikimedia.org/r/#/c/57079/ ) which: * Updated html output of two parsoid-centric tests to reflect changes in parsoid output. * Updated 'disabled parsoid' options on two tests to 'parsoid'. * Added three more tests for the Parsoid serializer. * Added two tests documenting differences in PHP and Parsoid output for overlapping HTML tags (sometimes seen on wikipedia pages). Change-Id: I8202973b36ceefaaca2a2e923a777a1286231a68 --- M js/tests/fetch-parserTests.txt.js M js/tests/parserTests-blacklist.js 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/js/tests/fetch-parserTests.txt.js b/js/tests/fetch-parserTests.txt.js index 8b67f2b..9897a1a 100755 --- a/js/tests/fetch-parserTests.txt.js +++ b/js/tests/fetch-parserTests.txt.js @@ -10,9 +10,9 @@ // and update these hashes automatically. // // You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value: -var expectedSHA1 = "f1af8c010dd69906e27036d787fbdc36f1067c55"; +var expectedSHA1 = "ee8166871e645c863aef8c61ce11b4d4bd29af46"; // git log --pretty=oneline -1 tests/parser/parserTests.txt -var latestCommit = "df27065fd7278c8c0519e1d400b21e88f383daf3"; +var latestCommit = "853f21b42e95b16c876c94245a5a4645dd982e93"; var fs = require('fs'), path = require('path'), diff --git a/js/tests/parserTests-blacklist.js b/js/tests/parserTests-blacklist.js index 3976d56..eaa58c8 100644 --- a/js/tests/parserTests-blacklist.js +++ b/js/tests/parserTests-blacklist.js @@ -57,7 +57,6 @@ add("wt2html", "Definition Lists: Nesting: Test 3 (Parsoid only)"); add("wt2html", "Non-extlinks in brackets"); add("wt2html", "Template-generated table cell attributes and cell content"); -add("wt2html", "Wikitext table with html-syntax row (Parsoid)"); add("wt2html", "Link containing \"#<\" and \"#>\" % as a hex sequences- these are valid section anchors\nExample for such a section: == < =="); add("wt2html", "Link containing \"<#\" and \">#\" as a hex sequences"); add("wt2html", "Link with double quotes in title part (literal) and alternate part (interpreted)"); @@ -380,6 +379,7 @@ add("wt2html", "anchorencode deals with links"); add("wt2html", "anchorencode encodes like the TOC generator: (bug 18431)"); add("wt2html", "Bug 6200: blockquotes and paragraph formatting"); +add("wt2html", "Parsing of overlapping (improperly nested) inline html tags (Parsoid)"); add("wt2html", "Self-link in language variants"); add("wt2html", "Link to another existing title shouldn't be parsed as self-link even if it's a variant of this title"); add("wt2html", "Link to pages in language variants"); @@ -488,7 +488,7 @@ add("wt2html", "Empty table rows go away"); add("wt2html", "RT-ed inter-element separators should be valid separators"); add("wt2html", "Trailing newlines in a deep dom-subtree that ends a wikitext line should be migrated out\n(Parsoid-only since PHP parser relies on Tidy for correct output)"); -add("wt2html", "Empty TR followed by a template-generated TR\n(Parsoid-specific since PHP parser doesn't handle this mixed tbl-wikitext)"); +add("wt2html", "Indented table with an empty td"); add("wt2html", "Multi-line image caption generated by templates with/without trailing newlines"); @@ -1804,6 +1804,7 @@ add("html2wt", "anchorencode encodes like the TOC generator: (bug 18431)"); add("html2wt", "Bug 6200: blockquotes and paragraph formatting"); add("html2wt", "Bug 8293: Use of center tag ruins paragraph formatting"); +add("html2wt", "Parsing of overlapping (improperly nested) inline html tags (Parsoid)"); add("html2wt", "Self-link in language variants"); add("html2wt", "Link to another existing title shouldn't be parsed as self-link even if it's a variant of this title"); add("html2wt", "Link to pages in language variants"); @@ -1951,8 +1952,11 @@ add("html2wt", "RT-ed inter-element separators should be valid separators"); add("html2wt", "Trailing newlines in a deep dom-subtree that ends a wikitext line should be migrated out\n(Parsoid-only since PHP parser relies on Tidy for correct output)"); add("html2wt", "Empty TD followed by TD with tpl-generated attribute"); +add("html2wt", "Indented table with an empty td"); add("html2wt", "Empty TR followed by a template-generated TR\n(Parsoid-specific since PHP parser doesn't handle this mixed tbl-wikitext)"); +add("html2wt", "Empty TR followed by mixed-ws-comment line should RT correctly"); add("html2wt", "Multi-line image caption generated by templates with/without trailing newlines"); +add("html2wt", "Improperly nested inline or quotes tags with whitespace in between"); // Blacklist for selser -- To view, visit https://gerrit.wikimedia.org/r/60368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8202973b36ceefaaca2a2e923a777a1286231a68 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Parsoid Gerrit-Branch: master Gerrit-Owner: Cscott <[email protected]> Gerrit-Reviewer: GWicke <[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
