summaryrefslogtreecommitdiff
path: root/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php')
-rw-r--r--tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php49
1 files changed, 18 insertions, 31 deletions
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
index 93a3ebba..8cefec75 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
@@ -31,16 +31,15 @@ class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
$module = new ResourceLoaderWikiModule( $params );
$module->setConfig( $config );
- // Use getDefinitionSummary because getPages is protected
- $summary = $module->getDefinitionSummary( ResourceLoaderContext::newDummyContext() );
- $this->assertEquals(
- $expected,
- $summary['pages']
- );
+ // Because getPages is protected..
+ $getPages = new ReflectionMethod( $module, 'getPages' );
+ $getPages->setAccessible( true );
+ $out = $getPages->invoke( $module, ResourceLoaderContext::newDummyContext() );
+ $this->assertEquals( $expected, $out );
}
public static function provideGetPages() {
- $settings = array(
+ $settings = self::getSettings() + array(
'UseSiteJs' => true,
'UseSiteCss' => true,
);
@@ -110,39 +109,27 @@ class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
array( array(), 'test1', true ),
// 'site' module with a non-empty page
array(
- array(
- 'MediaWiki:Common.js' => array(
- 'timestamp' => 123456789,
- 'length' => 1234
- )
- ), 'site', false,
+ array( 'MediaWiki:Common.js' => array( 'rev_sha1' => 'dmh6qn', 'rev_len' => 1234 ) ),
+ 'site',
+ false,
),
// 'site' module with an empty page
array(
- array(
- 'MediaWiki:Monobook.js' => array(
- 'timestamp' => 987654321,
- 'length' => 0,
- ),
- ), 'site', false,
+ array( 'MediaWiki:Foo.js' => array( 'rev_sha1' => 'phoi', 'rev_len' => 0 ) ),
+ 'site',
+ false,
),
// 'user' module with a non-empty page
array(
- array(
- 'User:FooBar/common.js' => array(
- 'timestamp' => 246813579,
- 'length' => 25,
- ),
- ), 'user', false,
+ array( 'User:Example/common.js' => array( 'rev_sha1' => 'j7ssba', 'rev_len' => 25 ) ),
+ 'user',
+ false,
),
// 'user' module with an empty page
array(
- array(
- 'User:FooBar/monobook.js' => array(
- 'timestamp' => 1357924680,
- 'length' => 0,
- ),
- ), 'user', true,
+ array( 'User:Example/foo.js' => array( 'rev_sha1' => 'phoi', 'rev_len' => 0 ) ),
+ 'user',
+ true,
),
);
}