[MediaWiki-commits] [Gerrit] Add normalized filename for LoremIpsum.djvu to mockAPI.js - change (mediawiki...parsoid)

jenkins-bot (Code Review) Tue, 18 Nov 2014 11:39:07 -0800

jenkins-bot has submitted this change and it was merged.

Change subject: Add normalized filename for LoremIpsum.djvu to mockAPI.js
......................................................................



Add normalized filename for LoremIpsum.djvu to mockAPI.js

* Fixes incorrect API response of missing file for that parser test
* Updated the relevant parser test with new wt2html output.
* That test fails wt2wt mode because serializer doesn't yet
  handle the page parameter.
* Selser failures are false negatives.

Change-Id: Iaca49583994cc27803887e081740f231299f99a9
---
M tests/mockAPI.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Marcoil: Looks good to me, approved
  Cscott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/mockAPI.js b/tests/mockAPI.js
index 59e08de..dd5b78b 100644
--- a/tests/mockAPI.js
+++ b/tests/mockAPI.js
@@ -45,7 +45,8 @@
                'Image:Foobar.svg': 'Foobar.svg',
                'File:Foobar.svg': 'Foobar.svg',
                'Image:Thumb.png': 'Thumb.png',
-               'File:Thumb.png': 'Thumb.png'
+               'File:Thumb.png': 'Thumb.png',
+               'File:LoremIpsum.djvu': 'LoremIpsum.djvu'
        },
 
        pnames = {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 484b6cf..754daac 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -307,7 +307,6 @@
 add("wt2html", "Width-sized image (using px, no following whitespace)", "<p 
data-parsoid='{\"dsr\":[0,26,0,0]}'><span typeof=\"mw:Image\" 
data-parsoid='{\"optList\":[{\"ck\":\"width\",\"ak\":\"640px\"}],\"dsr\":[0,26,null,null]}'><a
 href=\"./File:Foobar.jpg\" 
data-parsoid='{\"a\":{\"href\":\"./File:Foobar.jpg\"},\"sa\":{}}'><img 
resource=\"./File:Foobar.jpg\" 
src=\"//example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\" 
height=\"73\" width=\"640\" 
data-parsoid='{\"a\":{\"resource\":\"./File:Foobar.jpg\",\"height\":\"73\",\"width\":\"640\"},\"sa\":{\"resource\":\"Image:foobar.jpg\"}}'/></a></span></p>");
 add("wt2html", "Width-sized image (using px, with following whitespace - test 
regression from r39467)", "<p data-parsoid='{\"dsr\":[0,27,0,0]}'><span 
typeof=\"mw:Image\" 
data-parsoid='{\"optList\":[{\"ck\":\"width\",\"ak\":\"640px 
\"}],\"dsr\":[0,27,null,null]}'><a href=\"./File:Foobar.jpg\" 
data-parsoid='{\"a\":{\"href\":\"./File:Foobar.jpg\"},\"sa\":{}}'><img 
resource=\"./File:Foobar.jpg\" 
src=\"//example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\" 
height=\"73\" width=\"640\" 
data-parsoid='{\"a\":{\"resource\":\"./File:Foobar.jpg\",\"height\":\"73\",\"width\":\"640\"},\"sa\":{\"resource\":\"Image:foobar.jpg\"}}'/></a></span></p>");
 add("wt2html", "Width-sized image (using px, with preceding whitespace - test 
regression from r39467)", "<p data-parsoid='{\"dsr\":[0,27,0,0]}'><span 
typeof=\"mw:Image\" data-parsoid='{\"optList\":[{\"ck\":\"width\",\"ak\":\" 
640px\"}],\"dsr\":[0,27,null,null]}'><a href=\"./File:Foobar.jpg\" 
data-parsoid='{\"a\":{\"href\":\"./File:Foobar.jpg\"},\"sa\":{}}'><img 
resource=\"./File:Foobar.jpg\" 
src=\"//example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\" 
height=\"73\" width=\"640\" 
data-parsoid='{\"a\":{\"resource\":\"./File:Foobar.jpg\",\"height\":\"73\",\"width\":\"640\"},\"sa\":{\"resource\":\"Image:foobar.jpg\"}}'/></a></span></p>");
-add("wt2html", "Image with page parameter", "<meta typeof=\"mw:Placeholder\" 
data-parsoid='{\"src\":\"[[File:LoremIpsum.djvu|page=2]]\",\"optList\":[{\"ck\":\"page\",\"ak\":\"page=2\"}],\"dsr\":[0,31,null,null]}'/>");
 add("wt2html", "HTML with raw HTML ($wgRawHtml==true)", "<p 
data-parsoid='{\"dsr\":[0,39,0,0]}'>&lt;html>&lt;script>alert(1);&lt;/script>&lt;/html></p>");
 add("wt2html", "Parents of subpages, one level up, not named", "<p 
data-parsoid='{\"dsr\":[0,7,0,0]}'><a rel=\"mw:WikiLink\" 
href=\"./Subpage_test/L1/L2\" title=\"Subpage test/L1/L2\" 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Subpage_test/L1/L2\"},\"sa\":{\"href\":\"../\"},\"dsr\":[0,7,2,2]}'>Subpage_test/L1/L2</a></p>");
 add("wt2html", "Parents of subpages, two levels up, without trailing slash or 
name.", "<p data-parsoid='{\"dsr\":[0,9,0,0]}'><a rel=\"mw:WikiLink\" 
href=\"./Subpage_test/L1/L2/..\" title=\"Subpage test/L1/L2/..\" 
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"./Subpage_test/L1/L2/..\"},\"sa\":{\"href\":\"../..\"},\"dsr\":[0,9,2,2]}'>Subpage_test/L1/L2/..</a></p>");
@@ -525,6 +524,7 @@
 add("wt2wt", "Mixing markup for italics and bold", 
"'''<nowiki>bold'</nowiki>'''''bold''bolditalics'''''\n");
 add("wt2wt", "ISBN code coverage", "ISBN 978-0-1234-56&#x20;789\n");
 add("wt2wt", "RFC code coverage", "RFC 983&#x20;987\n");
+add("wt2wt", "Image with page parameter", "[[File:LoremIpsum.djvu]]\n");
 add("wt2wt", "Don't fall for the self-closing div", "<div>hello world</div>");
 add("wt2wt", "Parsing of overlapping (improperly nested) inline html tags", 
"<span><s>x</span>\n");
 add("wt2wt", "Don't break table handling if language converter markup is in 
the cell.", "{|\n|-\n| -{R |B}-\n|}");
@@ -838,7 +838,6 @@
 add("html2html", "Width-sized image (using px, no following whitespace)", "<p 
data-parsoid='{\"dsr\":[0,64,0,0]}'><img 
src=\"http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\"; 
alt=\"640px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/></p>\n");
 add("html2html", "Width-sized image (using px, with following whitespace - 
test regression from r39467)", "<p data-parsoid='{\"dsr\":[0,64,0,0]}'><img 
src=\"http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\"; 
alt=\"640px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/></p>\n");
 add("html2html", "Width-sized image (using px, with preceding whitespace - 
test regression from r39467)", "<p data-parsoid='{\"dsr\":[0,64,0,0]}'><img 
src=\"http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\"; 
alt=\"640px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/></p>\n");
-add("html2html", "Image with page parameter", "<p 
data-parsoid='{\"dsr\":[0,85,0,0]}'><img 
src=\"http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-2480px-LoremIpsum.djvu.jpg\";
 alt=\"page2-2480px-LoremIpsum.djvu.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[0,85,null,null]}'/></p>\n");
 add("html2html", "HTML with raw HTML ($wgRawHtml==true)", "<p 
data-parsoid='{\"dsr\":[0,26,0,0]}'>&lt;script>alert(1);&lt;/script></p>\n");
 add("html2html", "Parents of subpages, one level up", "<p 
data-parsoid='{\"dsr\":[0,62,0,0]}'>[/index.php?title=Subpage_test/L1/L2&amp;action=edit&amp;redlink=1
 L2]</p>\n");
 add("html2html", "Parents of subpages, one level up, not named", "<p 
data-parsoid='{\"dsr\":[0,78,0,0]}'>[/index.php?title=Subpage_test/L1/L2&amp;action=edit&amp;redlink=1
 Subpage test/L1/L2]</p>\n");
@@ -1611,7 +1610,7 @@
 add("html2wt", "Width-sized image (using px, no following whitespace)", 
"http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\n";);
 add("html2wt", "Width-sized image (using px, with following whitespace - test 
regression from r39467)", 
"http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\n";);
 add("html2wt", "Width-sized image (using px, with preceding whitespace - test 
regression from r39467)", 
"http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\n";);
-add("html2wt", "Image with page parameter", 
"http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-2480px-LoremIpsum.djvu.jpg\n";);
+add("html2wt", "Image with page parameter", "[[File:LoremIpsum.djvu]]\n");
 add("html2wt", "HTML with raw HTML ($wgRawHtml==true)", 
"<script>alert(1);</script>\n");
 add("html2wt", "Parents of subpages, one level up", 
"[/index.php?title=Subpage_test/L1/L2&action=edit&redlink=1 L2]\n");
 add("html2wt", "Parents of subpages, one level up, not named", 
"[/index.php?title=Subpage_test/L1/L2&action=edit&redlink=1 Subpage 
test/L1/L2]\n");
@@ -2657,6 +2656,8 @@
 add("selser", "RFC code coverage [[0,0,3]]", "RFC   983&#x20;\n");
 add("selser", "RFC code coverage [[0,0,4]]", "RFC   
983&#x20;ry0mhh5cy0fkzkt9");
 add("selser", "RFC code coverage [[2,0,2]]", "8rmi32979htfn7b9RFC   
983&#x20;4i0lf243q1j4te29987");
+add("selser", "Image with page parameter [2]", 
"t1gktsrwi7iizfr\n\n[[File:LoremIpsum.djvu|page=2]]");
+add("selser", "Image with page parameter [1]", 
"[[File:LoremIpsum.djvu|page=2]]");
 add("selser", "Another italics / bold test [[2,[2],2]]", " 
<nowiki>g3zpq0w1ofyr2j4i'</nowiki>''hkokburf7jtyy14i ''wjduo01g6x39pb9x'");
 add("selser", "Another italics / bold test [[2,0,3]]", " 
<nowiki>jzlpwo82biroogvi'</nowiki>'' ''");
 add("selser", "dt/dd/dl test [[1]]", ";;;::");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 41e33d5..b2807cc 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -16684,9 +16684,11 @@
 djvu
 !! wikitext
 [[File:LoremIpsum.djvu|page=2]]
-!! html
+!! html/php
 <p><a href="/index.php?title=File:LoremIpsum.djvu&amp;page=2" 
class="image"><img alt="LoremIpsum.djvu" 
src="http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-2480px-LoremIpsum.djvu.jpg";
 width="2480" height="3508" 
srcset="http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-3720px-LoremIpsum.djvu.jpg
 1.5x, 
http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-4960px-LoremIpsum.djvu.jpg
 2x" /></a>
 </p>
+!! html/parsoid
+<p><span class="mw-default-size" typeof="mw:Image" 
data-parsoid='{"optList":[{"ck":"page","ak":"page=2"}]}'><a 
href="./File:LoremIpsum.djvu" 
data-parsoid='{"a":{"href":"./File:LoremIpsum.djvu"},"sa":{}}'><img 
resource="./File:LoremIpsum.djvu" 
src="//example.com/images/5/5f/LoremIpsum.djvu" height="3508" width="2480" 
data-parsoid='{"a":{"resource":"./File:LoremIpsum.djvu","height":"3508","width":"2480"},"sa":{"resource":"File:LoremIpsum.djvu"}}'/></a></span></p>
 !! end
 
 !! test

-- 
To view, visit https://gerrit.wikimedia.org/r/173751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaca49583994cc27803887e081740f231299f99a9
Gerrit-PatchSet: 3
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: Marcoil <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add normalized filename for LoremIpsum.djvu to mockAPI.js - change (mediawiki...parsoid)

Reply via email to