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 "Add mediastatistics-header-3d"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
ResourceLoaderTestCase.php
diff --git
a/tests/phpunit/ResourceLoaderTestCase.php
b/tests/phpunit/ResourceLoaderTestCase.php
index
45cfdbf
..
a8a8f4d
100644
(file)
--- a/
tests/phpunit/ResourceLoaderTestCase.php
+++ b/
tests/phpunit/ResourceLoaderTestCase.php
@@
-14,9
+14,12
@@
abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
* @param array|string $options Language code or options array
* - string 'lang' Language code
* - string 'dir' Language direction (ltr or rtl)
* @param array|string $options Language code or options array
* - string 'lang' Language code
* - string 'dir' Language direction (ltr or rtl)
+ * - string 'modules' Pipe-separated list of module names
+ * - string|null 'only' "scripts" (unwrapped script), "styles" (stylesheet), or null
+ * (mw.loader.implement).
* @return ResourceLoaderContext
*/
* @return ResourceLoaderContext
*/
- protected function getResourceLoaderContext( $options = [] ) {
+ protected function getResourceLoaderContext( $options = []
, ResourceLoader $rl = null
) {
if ( is_string( $options ) ) {
// Back-compat for extension tests
$options = [ 'lang' => $options ];
if ( is_string( $options ) ) {
// Back-compat for extension tests
$options = [ 'lang' => $options ];
@@
-24,13
+27,16
@@
abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
$options += [
'lang' => 'en',
'dir' => 'ltr',
$options += [
'lang' => 'en',
'dir' => 'ltr',
+ 'skin' => 'vector',
+ 'modules' => 'startup',
+ 'only' => 'scripts',
];
];
- $resourceLoader = new ResourceLoader();
+ $resourceLoader =
$rl ?:
new ResourceLoader();
$request = new FauxRequest( [
'lang' => $options['lang'],
$request = new FauxRequest( [
'lang' => $options['lang'],
- 'modules' =>
'startup'
,
- 'only' =>
'scripts'
,
- 'skin' =>
'vector'
,
+ 'modules' =>
$options['modules']
,
+ 'only' =>
$options['only']
,
+ 'skin' =>
$options['skin']
,
'target' => 'phpunit',
] );
$ctx = $this->getMockBuilder( 'ResourceLoaderContext' )
'target' => 'phpunit',
] );
$ctx = $this->getMockBuilder( 'ResourceLoaderContext' )
@@
-151,6
+157,12
@@
class EmptyResourceLoader extends ResourceLoader {
public function __construct( Config $config = null, LoggerInterface $logger = null ) {
$this->setLogger( $logger ?: new NullLogger() );
$this->config = $config ?: MediaWikiServices::getInstance()->getMainConfig();
public function __construct( Config $config = null, LoggerInterface $logger = null ) {
$this->setLogger( $logger ?: new NullLogger() );
$this->config = $config ?: MediaWikiServices::getInstance()->getMainConfig();
+ // Source "local" is required by StartupModule
+ $this->addSource( 'local', $this->config->get( 'LoadScript' ) );
$this->setMessageBlobStore( new MessageBlobStore( $this, $this->getLogger() ) );
}
$this->setMessageBlobStore( new MessageBlobStore( $this, $this->getLogger() ) );
}
+
+ public function getErrors() {
+ return $this->errors;
+ }
}
}