dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes I5d11a642,I4ed191bd
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
OutputPageTest.php
diff --git
a/tests/phpunit/includes/OutputPageTest.php
b/tests/phpunit/includes/OutputPageTest.php
index
5fee505
..
2cfdfcd
100644
(file)
--- a/
tests/phpunit/includes/OutputPageTest.php
+++ b/
tests/phpunit/includes/OutputPageTest.php
@@
-38,7
+38,7
@@
class OutputPageTest extends MediaWikiTestCase {
}
$fauxRequest = new FauxRequest( $queryData, false );
}
$fauxRequest = new FauxRequest( $queryData, false );
- $this->setM
W
Globals( array(
+ $this->setM
w
Globals( array(
'wgRequest' => $fauxRequest,
) );
'wgRequest' => $fauxRequest,
) );
@@
-179,7
+179,7
@@
mw.loader.implement("test.quux",function($,jQuery){mw.test.baz({token:123});},{"
* @dataProvider provideMakeResourceLoaderLink
* @covers OutputPage::makeResourceLoaderLink
*/
* @dataProvider provideMakeResourceLoaderLink
* @covers OutputPage::makeResourceLoaderLink
*/
- public function testMakeResourceLoaderLink( $args, $expectedHtml) {
+ public function testMakeResourceLoaderLink( $args, $expectedHtml
) {
$this->setMwGlobals( array(
'wgResourceLoaderDebug' => false,
'wgResourceLoaderUseESI' => true,
$this->setMwGlobals( array(
'wgResourceLoaderDebug' => false,
'wgResourceLoaderUseESI' => true,
@@
-195,23
+195,24
@@
mw.loader.implement("test.quux",function($,jQuery){mw.test.baz({token:123});},{"
$method = $class->getMethod( 'makeResourceLoaderLink' );
$method->setAccessible( true );
$ctx = new RequestContext();
$method = $class->getMethod( 'makeResourceLoaderLink' );
$method->setAccessible( true );
$ctx = new RequestContext();
+ $ctx->setSkin( Skin::newFromKey( 'vector' ) );
$ctx->setLanguage( 'en' );
$out = new OutputPage( $ctx );
$rl = $out->getResourceLoader();
$rl->register( array(
$ctx->setLanguage( 'en' );
$out = new OutputPage( $ctx );
$rl = $out->getResourceLoader();
$rl->register( array(
- 'test.foo' => new ResourceLoaderTestModule(array(
+ 'test.foo' => new ResourceLoaderTestModule(
array(
'script' => 'mw.test.foo( { a: true } );',
'styles' => '.mw-test-foo { content: "style"; }',
)),
'script' => 'mw.test.foo( { a: true } );',
'styles' => '.mw-test-foo { content: "style"; }',
)),
- 'test.bar' => new ResourceLoaderTestModule(array(
+ 'test.bar' => new ResourceLoaderTestModule(
array(
'script' => 'mw.test.bar( { a: true } );',
'styles' => '.mw-test-bar { content: "style"; }',
)),
'script' => 'mw.test.bar( { a: true } );',
'styles' => '.mw-test-bar { content: "style"; }',
)),
- 'test.baz' => new ResourceLoaderTestModule(array(
+ 'test.baz' => new ResourceLoaderTestModule(
array(
'script' => 'mw.test.baz( { a: true } );',
'styles' => '.mw-test-baz { content: "style"; }',
)),
'script' => 'mw.test.baz( { a: true } );',
'styles' => '.mw-test-baz { content: "style"; }',
)),
- 'test.quux' => new ResourceLoaderTestModule(array(
+ 'test.quux' => new ResourceLoaderTestModule(
array(
'script' => 'mw.test.baz( { token: 123 } );',
'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
'group' => 'private',
'script' => 'mw.test.baz( { token: 123 } );',
'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
'group' => 'private',