Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 1 insertions, 60 deletions

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' ),