Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/77828
Change subject: Tweak mockAPI to yield image paths consistent with PHP
parserTests.
......................................................................
Tweak mockAPI to yield image paths consistent with PHP parserTests.
This is one step in an effort to make the PHP and Parsoid parserTests
correspond more closely.
Change-Id: I32dd818e1a94e3b187608234fbf3203a52921f99
---
M js/tests/mockAPI.js
M js/tests/parserTests.txt
2 files changed, 40 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/28/77828/1
diff --git a/js/tests/mockAPI.js b/js/tests/mockAPI.js
index 9dbe2ff..76bf412 100644
--- a/js/tests/mockAPI.js
+++ b/js/tests/mockAPI.js
@@ -1,6 +1,24 @@
// This file is used to run a stub API that mimicks the MediaWiki interface
// for the purposes of testing extension expansion.
var express = require('express');
+var crypto = require('crypto');
+
+// configuration to match PHP parserTests
+var IMAGE_BASE_URL = 'http://example.com/images';
+var IMAGE_DESC_URL = IMAGE_BASE_URL;
+//IMAGE_BASE_URL='http://upload.wikimedia.org/wikipedia/commons';
+//IMAGE_DESC_URL='http://commons.wikimedia.org/wiki';
+var FILE_PROPS = {
+ 'Foobar.jpg': {
+ size: 7881, width: 1941, height: 220, bits: 8, mime:
'image/jpeg'
+ },
+ 'Thumb.png': {
+ size: 22589, width: 135, height: 135, bits: 8, mime: 'image/png'
+ },
+ 'Foobar.svg': {
+ size: 12345, width: 240, height: 180, bits: 24, mime:
'image/svg+xml'
+ }
+};
/* -------------------- web app access points below --------------------- */
@@ -68,20 +86,24 @@
query: function ( body, cb ) {
var filename = body.titles,
normPagename = pnames[filename] || filename,
- normFilename = fnames[filename] || filename,
- baseurl =
'http://upload.wikimedia.org/wikipedia/commons/3/3a/' + normFilename,
- height = 220,
- width = 1941,
+ normFilename = fnames[filename] || filename;
+ var props = FILE_PROPS[normFilename] ||
Object.create(null);
+ var md5 = crypto.createHash('md5').update(normFilename).
+ digest('hex');
+ var baseurl = IMAGE_BASE_URL + '/' +
+ md5[0] + '/' + md5[0] + md5[1] + '/' +
normFilename,
+ height = props.height || 220,
+ width = props.width || 1941,
twidth = body.iiurlwidth,
theight = body.iiurlheight,
turl = baseurl,
- durl = 'http://commons.wikimedia.org/wiki/' +
normFilename,
+ durl = IMAGE_DESC_URL + '/' + normFilename,
imageinfo = {
pageid: 1,
ns: 6,
title: normPagename,
imageinfo: [ {
- size: 12345,
+ size: props.size || 12345,
height: height,
width: width,
url: baseurl,
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index 85330e6..b9c5c20 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -8599,7 +8599,7 @@
<p>
<span class="mw-default-size" typeof="mw:Image">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220"
width="1941">
+<img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg"
height="220" width="1941">
</a>
</span>
</p>
@@ -8615,7 +8615,7 @@
<p>
<span class="mw-default-size" typeof="mw:Image">
<span>
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220"
width="1941">
+<img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg"
height="220" width="1941">
</span>
</span>
</p>
@@ -8631,7 +8631,7 @@
<p>
<span class="mw-default-size" typeof="mw:Image">
<a href="Main_Page">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg" height="220"
width="1941">
+<img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg"
height="220" width="1941">
</a>
</span>
</p>
@@ -8647,7 +8647,7 @@
<p>
<span class="mw-valign-middle" typeof="mw:Image">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/50px-Foobar.jpg"
height="6" width="50">
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/50px-Foobar.jpg" height="6"
width="50">
</a>
</span>
</p>
@@ -8663,7 +8663,7 @@
<p>
<span class="mw-valign-baseline" typeof="mw:Image"
data-mw="{"caption":"caption"}">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/89px-Foobar.jpg"
height="10" width="89">
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/89px-Foobar.jpg" height="10"
width="89">
</a>
</span>
</p>
@@ -8679,7 +8679,7 @@
<p>
<span class="mw-image-border" typeof="mw:Image"
data-mw="{"caption":"caption"}">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/50px-Foobar.jpg"
height="6" width="50">
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/50px-Foobar.jpg" height="6"
width="50">
</a>
</span>
</p>
@@ -8694,7 +8694,7 @@
!! result
<figure class="mw-default-size mw-halign-left mw-valign-baseline"
typeof="mw:Image/Thumb">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/180px-Foobar.jpg"
height="21" width="180" />
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/180px-Foobar.jpg" height="21"
width="180" />
</a>
<figcaption>caption content</figcaption>
</figure>
@@ -8709,7 +8709,7 @@
!! result
<figure class="mw-halign-right mw-valign-middle" typeof="mw:Image/Thumb">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/50px-Foobar.jpg"
height="6" width="50" />
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/50px-Foobar.jpg" height="6"
width="50" />
</a>
<figcaption>caption</figcaption>
</figure>
@@ -8724,7 +8724,7 @@
!! result
<figure typeof="mw:Image/Frame">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/442px-Foobar.jpg"
height="50" width="442" />
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/442px-Foobar.jpg" height="50"
width="442" />
</a>
<figcaption>caption</figcaption>
</figure>
@@ -8739,7 +8739,7 @@
!! result
<figure class="mw-halign-left mw-valign-baseline" typeof="mw:Image/Frame">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/442px-Foobar.jpg"
height="50" width="442" />
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/442px-Foobar.jpg" height="50"
width="442" />
</a>
<figcaption>caption</figcaption>
</figure>
@@ -8755,7 +8755,7 @@
<p>
<span class="mw-image-border" typeof="mw:Image/Frameless"
data-mw="{"caption":"caption"}">
<a href="File:Foobar.jpg">
-<img resource="./File:Foobar.jpg"
src="//upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg/442px-Foobar.jpg"
height="50" width="442" />
+<img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg/442px-Foobar.jpg" height="50"
width="442" />
</a>
</p>
!! end
@@ -8770,7 +8770,7 @@
#<p>
#<span typeof="mw:Image">
#<a class="mw-default-size" href="Image:Foobar.jpg">
-#<img alt="Foobar.jpg" class="mw-default-size"
src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg";
height="220" width="1941">
+#<img alt="Foobar.jpg" class="mw-default-size"
src="http://example.com/images/3/3a/Foobar.jpg"; height="220" width="1941">
#</a>
#<span>abc</span>
#</span>
--
To view, visit https://gerrit.wikimedia.org/r/77828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32dd818e1a94e3b187608234fbf3203a52921f99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg"](https://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg"){kind=link}
![http://example.com/images/3/3a/Foobar.jpg"](http://example.com/images/3/3a/Foobar.jpg"){kind=link}