Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119545
Change subject: Allow setting default thumb size in parser tests
......................................................................
Allow setting default thumb size in parser tests
The mediawiki default thumb size is 180px. The Parsoid default thumb
size is 220px, to match the WMF default thumb size for wikipedia.
This leads to inconsistent image-related test output. Allow a test to
set an explicit default thumb size with the 'thumbsize' option so that
it is possible to write consistent tests.
Change-Id: Ib764d1f1660a50caaf8f0ff245822d1d1a1d264e
---
M tests/parser/parserTest.inc
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/NewParserTest.php
3 files changed, 39 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/119545/1
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 65296d5..ef2f9c6 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -787,6 +787,7 @@
'wgSVGConverters' => array( 'null' => 'echo
"1">$output' ),
'wgLocaltimezone' => 'UTC',
'wgAllowExternalImages' => self::getOptionValue(
'wgAllowExternalImages', $opts, true ),
+ 'wgThumbLimits' => array( self::getOptionValue(
'thumbsize', $opts, 180 ) ),
'wgUseTidy' => false,
'wgDefaultLanguageVariant' => $variant,
'wgVariantArticlePath' => false,
@@ -841,8 +842,10 @@
$context = new RequestContext();
$GLOBALS['wgLang'] = $context->getLanguage();
$GLOBALS['wgOut'] = $context->getOutput();
+ $GLOBALS['wgUser'] = $context->getUser();
- $GLOBALS['wgUser'] = new User();
+ // We (re)set $wgThumbLimits to a single-element array above.
+ $context->getUser()->setOption( 'thumbsize', 0 );
global $wgHooks;
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index cee6035..e8761ea 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -29,6 +29,7 @@
# comment run through Linker::formatComment() instead of main parser
# local format section links in edit comment text as local links
# notoc disable table of contents
+# thumbsize=NNN set the default thumb size to NNNpx for this test
#
# You can also set the following parser properties via test options:
# wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
@@ -9749,13 +9750,15 @@
!! test
Allow empty links in image captions (Bug 60753)
+!! options
+thumbsize=220
!! wikitext
[[File:Foobar.jpg|thumb|Caption [[Link1]]
[[]]
[[Link2]]
]]
!! html/php
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>Caption <a
href="/index.php?title=Link1&action=edit&redlink=1" class="new"
title="Link1 (page does not exist)">Link1</a> [[]] <a
href="/index.php?title=Link2&action=edit&redlink=1" class="new"
title="Link2 (page does not exist)">Link2</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>Caption <a
href="/index.php?title=Link1&action=edit&redlink=1" class="new"
title="Link1 (page does not exist)">Link1</a> [[]] <a
href="/index.php?title=Link2&action=edit&redlink=1" class="new"
title="Link2 (page does not exist)">Link2</a></div></div></div>
!! html/parsoid
<figure class="mw-default-size" typeof="mw:Image/Thumb"
data-parsoid='{"optList":[{"ck":"thumbnail","ak":"thumb"},{"ck":"caption","ak":"Caption
[[Link1]]\n[[]]\n[[Link2]]\n"}],"dsr":[0,59,2,2]}'><a href="./File:Foobar.jpg"
data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"dsr":[2,null,null,null]}'><img
resource="./File:Foobar.jpg"
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" height="25"
width="220"
data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"25","width":"220"},"sa":{"resource":"File:Foobar.jpg"}}'/></a><figcaption
data-parsoid='{"dsr":[null,57,null,null]}'>Caption <a rel="mw:WikiLink"
href="./Link1"
data-parsoid='{"stx":"simple","a":{"href":"./Link1"},"sa":{"href":"Link1"},"dsr":[32,41,2,2]}'>Link1</a>
@@ -9834,6 +9837,8 @@
!! test
Image with link tails
+!! options
+thumbsize=220
!! wikitext
123[[File:Foobar.jpg]]456
123[[File:Foobar.jpg|right]]456
@@ -9842,7 +9847,7 @@
<p>123<a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/3/3a/Foobar.jpg"; width="1941" height="220"
/></a>456
</p>
123<div class="floatright"><a href="/wiki/File:Foobar.jpg" class="image"><img
alt="Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg"; width="1941"
height="220" /></a></div>456
-123<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div></div></div></div>456
+123<div class="thumb tright"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div></div></div></div>456
!! html/parsoid
<p>123<span class="mw-default-size" typeof="mw:Image"><a
href="File:Foobar.jpg"><img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="220"
width="1941"></a></span>456</p>
@@ -9874,12 +9879,14 @@
!! test
Image with multiple alignments -- use first (bug 48664)
+!! options
+thumbsize=220
!! wikitext
[[File:Foobar.jpg|thumb|left|right|center|caption]]
[[File:Foobar.jpg|middle|text-top|caption]]
!! html/php
-<div class="thumb tleft"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
+<div class="thumb tleft"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
<p><a href="/wiki/File:Foobar.jpg" class="image" title="caption"><img
alt="caption" src="http://example.com/images/3/3a/Foobar.jpg"; width="1941"
height="220" style="vertical-align: middle" /></a>
</p>
!! html/parsoid
@@ -10035,11 +10042,12 @@
!! test
Thumbnail image with link parameter
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb|link=http://example.com/|Title]]
!! html/php
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="http://example.com/";><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>Title</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:222px;"><a
href="http://example.com/";><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>Title</div></div></div>
!! html/parsoid
<figure class="mw-default-size" typeof="mw:Image/Thumb"><a
href="http://example.com/";><img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a><figcaption>Title</figcaption></figure>
@@ -10047,6 +10055,8 @@
!! test
Manually-specified thumbnail image
+!! options
+thumbsize=220
!! wikitext
[[File:Foobar.jpg|thumb=Thumb.png|Title]]
!! html/php
@@ -10059,6 +10069,7 @@
!! test
Manually-specified thumbnail image with explicit link to wiki page
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb=Thumb.png|link=Main_Page|Title]]
@@ -10072,6 +10083,7 @@
!! test
Manually-specified thumbnail image with explicit link to url
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb=Thumb.png|link=http://example.com|Title]]
@@ -10085,6 +10097,7 @@
!! test
Manually-specified thumbnail image with explicit no link
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb=Thumb.png|link=|Title]]
@@ -10098,6 +10111,7 @@
!! test
Manually-specified thumbnail image with explicit link and alt text
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb=Thumb.png|link=Main_Page|alt=alttext|Title]]
@@ -10313,10 +10327,12 @@
!! test
Thumbnail image caption with a free URL
+!! options
+thumbsize=220
!! wikitext
[[File:Foobar.jpg|thumb|http://example.com]]
!! html/php
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a rel="nofollow" class="external free"
href="http://example.com";>http://example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a rel="nofollow" class="external free"
href="http://example.com";>http://example.com</a></div></div></div>
!! html/parsoid
<figure class="mw-default-size" typeof="mw:Image/Thumb"><a
href="File:Foobar.jpg"><img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a><figcaption><a rel="mw:ExtLink"
href="http://example.com";>http://example.com</a></figcaption></figure>
@@ -10325,11 +10341,12 @@
!! test
Thumbnail image caption with a free URL and explicit alt
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb|http://example.com|alt=Alteration]]
!! html/php
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="Alteration"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a rel="nofollow" class="external free"
href="http://example.com";>http://example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="Alteration"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a rel="nofollow" class="external free"
href="http://example.com";>http://example.com</a></div></div></div>
!! html/parsoid
<figure class="mw-default-size" typeof="mw:Image/Thumb"><a
href="File:Foobar.jpg"><img alt="Alteration" resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a><figcaption><a rel="mw:ExtLink"
href="http://example.com";>http://example.com</a></figcaption></figure>
@@ -10549,12 +10566,13 @@
!! test
Localized image handling (2).
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
language=es
!! wikitext
[[Archivo:Foobar.jpg|miniatura|izquierda|enlace=foo|caption]]
!! html/php
-<div class="thumb tleft"><div class="thumbinner" style="width:182px;"><a
href="/wiki/Foo" title="Foo"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a
href="/wiki/Archivo:Foobar.jpg" class="internal" title="Aumentar"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
+<div class="thumb tleft"><div class="thumbinner" style="width:222px;"><a
href="/wiki/Foo" title="Foo"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a
href="/wiki/Archivo:Foobar.jpg" class="internal" title="Aumentar"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
!! html/parsoid
<figure class="mw-default-size mw-halign-left" typeof="mw:Image/Thumb"><a
href="./Foo"><img resource="./Archivo:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a><figcaption>caption</figcaption></figure>
@@ -10563,11 +10581,12 @@
!! test
"border", "frameless" and "class" attributes on an image.
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|frameless|border|class=extra|caption]]
!! html/php
-<p><a href="/wiki/File:Foobar.jpg" class="image" title="caption"><img
alt="caption"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="extra thumbborder"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="caption"><img
alt="caption"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="extra thumbborder"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
</p>
!! html/parsoid
<p><span class="mw-default-size mw-image-border extra"
typeof="mw:Image/Frameless" data-mw='{"caption":"caption"}'><a
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a></span></p>
@@ -10577,6 +10596,7 @@
!! test
Invalid image attributes (bug 62500)
!! options
+thumbsize=220
parsoid=wt2html,wt2wt,html2html
!! wikitext
[[File:Foobar.jpg|thumb|float|left|caption]]
@@ -10585,9 +10605,9 @@
[[File:Foobar.jpg|bogus1|thumb|bogus2|left|bogus3|caption]]
!! html/php
-<div class="thumb tleft"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
-<div class="thumb tleft"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
+<div class="thumb tleft"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
+<div class="thumb tleft"><div class="thumbinner" style="width:222px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg";
width="220" height="25" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x" /></a>
<div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>caption</div></div></div>
!! html/parsoid
<figure class="mw-default-size mw-halign-left" typeof="mw:Image/Thumb"><a
href="File:Foobar.jpg"><img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a><figcaption>caption</figcaption></figure><figure
class="mw-default-size" typeof="mw:Image/Thumb"><a href="File:Foobar.jpg"><img
resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg"
height="25" width="220"/></a><figcaption>caption</figcaption></figure><figure
class="mw-default-size mw-halign-left" typeof="mw:Image/Thumb"><a
href="File:Foobar.jpg"><img resource="./File:Foobar.jpg"
src="//example.com/images/3/3a/Foobar.jpg" height="25"
width="220"/></a><figcaption>caption</figcaption></figure>
diff --git a/tests/phpunit/includes/parser/NewParserTest.php
b/tests/phpunit/includes/parser/NewParserTest.php
index f75b254..c6ded02 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -337,6 +337,7 @@
'wgRawHtml' => self::getOptionValue( 'wgRawHtml',
$opts, false ),
'wgNamespacesWithSubpages' => array( NS_MAIN => isset(
$opts['subpage'] ) ),
'wgAllowExternalImages' => self::getOptionValue(
'wgAllowExternalImages', $opts, true ),
+ 'wgThumbLimits' => array( self::getOptionValue(
'thumbsize', $opts, 180 ) ),
'wgMaxTocLevel' => $maxtoclevel,
'wgUseTeX' => isset( $opts['math'] ) || isset(
$opts['texvc'] ),
'wgMathDirectory' => $uploadDir . '/math',
@@ -368,6 +369,9 @@
$settings['wgUser'] = $context->getUser();
$settings['wgRequest'] = $context->getRequest();
+ // We (re)set $wgThumbLimits to a single-element array above.
+ $context->getUser()->setOption( 'thumbsize', 0 );
+
foreach ( $settings as $var => $val ) {
if ( array_key_exists( $var, $GLOBALS ) ) {
$this->savedGlobals[$var] = $GLOBALS[$var];
--
To view, visit https://gerrit.wikimedia.org/r/119545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib764d1f1660a50caaf8f0ff245822d1d1a1d264e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg"](http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg"){kind=link}
![http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg"](http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg"){kind=link}
![http://example.com/images/3/3a/Foobar.jpg"](http://example.com/images/3/3a/Foobar.jpg"){kind=link}