From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1
---
.../resourceloader/ResourceLoaderModuleTest.php | 61 +---------------------
1 file changed, 1 insertion(+), 60 deletions(-)
(limited to 'tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php')
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
index b0edaaf7..6d1ed4e0 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
@@ -2,71 +2,12 @@
class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
- protected function setUp() {
- parent::setUp();
-
- // The return value of the closure shouldn't matter since this test should
- // never call it
- SkinFactory::getDefaultInstance()->register(
- 'fakeskin',
- 'FakeSkin',
- function () {
- }
- );
- }
-
- /**
- * @covers ResourceLoaderFileModule::getAllSkinStyleFiles
- */
- public function testGetAllSkinStyleFiles() {
- $context = self::getResourceLoaderContext();
-
- $baseParams = array(
- 'scripts' => array(
- 'foo.js',
- 'bar.js',
- ),
- 'styles' => array(
- 'foo.css',
- 'bar.css' => array( 'media' => 'print' ),
- 'screen.less' => array( 'media' => 'screen' ),
- 'screen-query.css' => array( 'media' => 'screen and (min-width: 400px)' ),
- ),
- 'skinStyles' => array(
- 'default' => 'quux-fallback.less',
- 'fakeskin' => array(
- 'baz-vector.css',
- 'quux-vector.less',
- ),
- ),
- 'messages' => array(
- 'hello',
- 'world',
- ),
- );
-
- $module = new ResourceLoaderFileModule( $baseParams );
-
- $this->assertEquals(
- array(
- 'foo.css',
- 'baz-vector.css',
- 'quux-vector.less',
- 'quux-fallback.less',
- 'bar.css',
- 'screen.less',
- 'screen-query.css',
- ),
- array_map( 'basename', $module->getAllStyleFiles() )
- );
- }
-
/**
* @covers ResourceLoaderModule::getDefinitionSummary
* @covers ResourceLoaderFileModule::getDefinitionSummary
*/
public function testDefinitionSummary() {
- $context = self::getResourceLoaderContext();
+ $context = $this->getResourceLoaderContext();
$baseParams = array(
'scripts' => array( 'foo.js', 'bar.js' ),
--
cgit v1.2.3-54-g00ecf