jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
......................................................................
Sync parserTests with core.
This matches upstream commit e07be1427ba6560fe8b08c720bfed9a2aa87f290.
It contains new parser tests for bug 44498 and bug 49400. These bugs
are not yet fixed, so it also updates the blacklist to account for the
new failures.
Change-Id: Ib5ff2443dd29c85c2aef4a9638385e0ffbfb82cb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 61 insertions(+), 2 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 1f92ba5..aa6d787 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 = "dbf294faadb0fca67f9a267e6864d40909581788";
+var expectedSHA1 = "d1619d3fe6fc04c2b33a0ecb6c28ae1ee4d28270";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "cd9ad736027025a784499807668da50865ec18eb";
+var latestCommit = "e07be1427ba6560fe8b08c720bfed9a2aa87f290";
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index 69e28e2..d19c480 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -62,6 +62,8 @@
add("wt2html", "External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check)");
add("wt2html", "Non-extlinks in brackets");
add("wt2html", "Template-generated table cell attributes and cell content");
+add("wt2html", "Template-generated table cell attributes and cell content
(2)");
+add("wt2html", "Template-generated table cell attributes and cell content
(3)");
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 containing double-single-quotes '' in text embedded in
italics (bug 4598 sanity check)");
@@ -199,6 +201,7 @@
add("wt2html", "Simple image (using File: namespace, now canonical)");
add("wt2html", "Image with caption");
add("wt2html", "Image with empty attribute");
+add("wt2html", "Image with attributes from template.");
add("wt2html", "Image with link tails");
add("wt2html", "Image with multiple captions -- only last one is accepted");
add("wt2html", "Image with width attribute at different positions");
@@ -904,6 +907,7 @@
add("html2html", "Simple image (using File: namespace, now canonical)");
add("html2html", "Image with caption");
add("html2html", "Image with empty attribute");
+add("html2html", "Image with attributes from template.");
add("html2html", "Image with link tails");
add("html2html", "Image with multiple captions -- only last one is accepted");
add("html2html", "Image with width attribute at different positions");
@@ -1393,6 +1397,8 @@
add("html2wt", "Table security: embedded pipes
(http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html)");
add("html2wt", "Indented table markup mixed with indented pre content
(proposed in bug 6200)");
add("html2wt", "Template-generated table cell attributes and cell content");
+add("html2wt", "Template-generated table cell attributes and cell content
(2)");
+add("html2wt", "Template-generated table cell attributes and cell content
(3)");
add("html2wt", "Table with row followed by newlines and table heading");
add("html2wt", "Table with empty line following the start tag");
add("html2wt", "Table attributes with empty value");
@@ -1679,6 +1685,7 @@
add("html2wt", "Simple image (using File: namespace, now canonical)");
add("html2wt", "Image with caption");
add("html2wt", "Image with empty attribute");
+add("html2wt", "Image with attributes from template.");
add("html2wt", "Image with link tails");
add("html2wt", "Image with multiple captions -- only last one is accepted");
add("html2wt", "Image with width attribute at different positions");
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index aedbf45..76388d9 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -121,6 +121,19 @@
!! endarticle
!! article
+Template:table_cells
+!! text
+{{table_attribs}} || Bar || Baz
+!! endarticle
+
+!! article
+Template:image_attribs
+!! text
+<noinclude>
+[[File:foobar.jpg|</noinclude>right|Caption text<noinclude>]]</noinclude>
+!! endarticle
+
+!! article
A?b
!! text
Weirdo titles!
@@ -3851,6 +3864,36 @@
<table>
<tr>
<td style="color: red"> Foo
+</td></tr></table>
+
+!! end
+
+!! test
+Template-generated table cell attributes and cell content (2)
+!! input
+{|
+|align=center {{table_attribs}}
+|}
+!! result
+<table>
+<tr>
+<td align="center" style="color: red"> Foo
+</td></tr></table>
+
+!! end
+
+!! test
+Template-generated table cell attributes and cell content (3)
+!! input
+{|
+|align=center {{table_cells}}
+|}
+!! result
+<table>
+<tr>
+<td align="center" style="color: red"> Foo </td>
+<td> Bar </td>
+<td> Baz
</td></tr></table>
!! end
@@ -7930,6 +7973,15 @@
!! end
!! test
+Image with attributes from template.
+!! input
+[[Image:foobar.jpg|{{image_attribs}}]]
+!! result
+<div class="floatright"><a href="/wiki/File:Foobar.jpg" class="image"
title="Caption text"><img alt="Caption text"
src="http://example.com/images/3/3a/Foobar.jpg"; width="1941" height="220"
/></a></div>
+
+!! end
+
+!! test
Image with link tails
!! input
123[[Image:foobar.jpg]]456
--
To view, visit https://gerrit.wikimedia.org/r/76864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5ff2443dd29c85c2aef4a9638385e0ffbfb82cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[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
![http://example.com/images/3/3a/Foobar.jpg"](http://example.com/images/3/3a/Foobar.jpg"){kind=link}