X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fresourceloader%2FResourceLoaderSkinModuleTest.php;h=0718af6d8e03c07ecd0679622cd404029a9df774;hb=255d76f2a13a8378ded9f0cf1c2bb172f7f07a5b;hp=c56769827ac15379931d873a1f4e7a97395bf9cd;hpb=1b86e6bb67708d24fce32b3940c926c8314dfcbf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
index c56769827a..0718af6d8e 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
@@ -1,15 +1,18 @@
 <?php
 
 /**
- * @group Database
  * @group ResourceLoader
  */
 class ResourceLoaderSkinModuleTest extends PHPUnit_Framework_TestCase {
 
+	use MediaWikiCoversValidator;
+
 	public static function provideGetStyles() {
+		// phpcs:disable Generic.Files.LineLength
 		return [
 			[
 				'parent' => [],
+				'logo' => '/logo.png',
 				'expected' => [
 					'all' => [ '.mw-wiki-logo { background-image: url(/logo.png); }' ],
 				],
@@ -18,12 +21,52 @@ class ResourceLoaderSkinModuleTest extends PHPUnit_Framework_TestCase {
 				'parent' => [
 					'screen' => '.example {}',
 				],
+				'logo' => '/logo.png',
 				'expected' => [
 					'screen' => [ '.example {}' ],
 					'all' => [ '.mw-wiki-logo { background-image: url(/logo.png); }' ],
 				],
 			],
+			[
+				'parent' => [],
+				'logo' => [
+					'1x' => '/logo.png',
+					'1.5x' => '/logo@1.5x.png',
+					'2x' => '/logo@2x.png',
+				],
+				'expected' => [
+					'all' => [ <<<CSS
+.mw-wiki-logo { background-image: url(/logo.png); }
+CSS
+					],
+					'(-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (min-resolution: 1.5dppx), (min-resolution: 144dpi)' => [ <<<CSS
+.mw-wiki-logo { background-image: url(/logo@1.5x.png);background-size: 135px auto; }
+CSS
+					],
+					'(-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (min-resolution: 2dppx), (min-resolution: 192dpi)' => [ <<<CSS
+.mw-wiki-logo { background-image: url(/logo@2x.png);background-size: 135px auto; }
+CSS
+					],
+				],
+			],
+			[
+				'parent' => [],
+				'logo' => [
+					'1x' => '/logo.png',
+					'svg' => '/logo.svg',
+				],
+				'expected' => [
+					'all' => [ <<<CSS
+.mw-wiki-logo { background-image: url(/logo.png); }
+CSS
+					, <<<CSS
+.mw-wiki-logo { background-image: -webkit-linear-gradient(transparent, transparent), url(/logo.svg); background-image: linear-gradient(transparent, transparent), url(/logo.svg);background-size: 135px auto; }
+CSS
+					],
+				],
+			],
 		];
+		// phpcs:enable
 	}
 
 	/**
@@ -31,25 +74,24 @@ class ResourceLoaderSkinModuleTest extends PHPUnit_Framework_TestCase {
 	 * @covers ResourceLoaderSkinModule::normalizeStyles
 	 * @covers ResourceLoaderSkinModule::getStyles
 	 */
-	public function testGetStyles( $parent, $expected ) {
+	public function testGetStyles( $parent, $logo, $expected ) {
 		$module = $this->getMockBuilder( ResourceLoaderSkinModule::class )
 			->disableOriginalConstructor()
-			->setMethods( [ 'readStyleFiles' ] )
+			->setMethods( [ 'readStyleFiles', 'getConfig', 'getLogoData' ] )
 			->getMock();
 		$module->expects( $this->once() )->method( 'readStyleFiles' )
 			->willReturn( $parent );
-		$module->setConfig( new HashConfig( [
-			'ResourceBasePath' => '/w',
-			'Logo' => '/logo.png',
-			'LogoHD' => false,
-		] ) );
+		$module->expects( $this->once() )->method( 'getConfig' )
+			->willReturn( new HashConfig() );
+		$module->expects( $this->once() )->method( 'getLogoData' )
+			->willReturn( $logo );
 
 		$ctx = $this->getMockBuilder( ResourceLoaderContext::class )
 			->disableOriginalConstructor()->getMock();
 
 		$this->assertEquals(
-			$module->getStyles( $ctx ),
-			$expected
+			$expected,
+			$module->getStyles( $ctx )
 		);
 	}
 
@@ -64,4 +106,102 @@ class ResourceLoaderSkinModuleTest extends PHPUnit_Framework_TestCase {
 
 		$this->assertFalse( $module->isKnownEmpty( $ctx ) );
 	}
+
+	/**
+	 * @dataProvider provideGetLogo
+	 * @covers ResourceLoaderSkinModule::getLogo
+	 */
+	public function testGetLogo( $config, $expected, $baseDir = null ) {
+		if ( $baseDir ) {
+			$oldIP = $GLOBALS['IP'];
+			$GLOBALS['IP'] = $baseDir;
+			$teardown = new Wikimedia\ScopedCallback( function () use ( $oldIP ) {
+				$GLOBALS['IP'] = $oldIP;
+			} );
+		}
+
+		$this->assertEquals(
+			$expected,
+			ResourceLoaderSkinModule::getLogo( new HashConfig( $config ) )
+		);
+	}
+
+	public function provideGetLogo() {
+		return [
+			'simple' => [
+				'config' => [
+					'ResourceBasePath' => '/w',
+					'Logo' => '/img/default.png',
+					'LogoHD' => false,
+				],
+				'expected' => '/img/default.png',
+			],
+			'default and 2x' => [
+				'config' => [
+					'ResourceBasePath' => '/w',
+					'Logo' => '/img/default.png',
+					'LogoHD' => [
+						'2x' => '/img/two-x.png',
+					],
+				],
+				'expected' => [
+					'1x' => '/img/default.png',
+					'2x' => '/img/two-x.png',
+				],
+			],
+			'default and all HiDPIs' => [
+				'config' => [
+					'ResourceBasePath' => '/w',
+					'Logo' => '/img/default.png',
+					'LogoHD' => [
+						'1.5x' => '/img/one-point-five.png',
+						'2x' => '/img/two-x.png',
+					],
+				],
+				'expected' => [
+					'1x' => '/img/default.png',
+					'1.5x' => '/img/one-point-five.png',
+					'2x' => '/img/two-x.png',
+				],
+			],
+			'default and SVG' => [
+				'config' => [
+					'ResourceBasePath' => '/w',
+					'Logo' => '/img/default.png',
+					'LogoHD' => [
+						'svg' => '/img/vector.svg',
+					],
+				],
+				'expected' => [
+					'1x' => '/img/default.png',
+					'svg' => '/img/vector.svg',
+				],
+			],
+			'everything' => [
+				'config' => [
+					'ResourceBasePath' => '/w',
+					'Logo' => '/img/default.png',
+					'LogoHD' => [
+						'1.5x' => '/img/one-point-five.png',
+						'2x' => '/img/two-x.png',
+						'svg' => '/img/vector.svg',
+					],
+				],
+				'expected' => [
+					'1x' => '/img/default.png',
+					'svg' => '/img/vector.svg',
+				],
+			],
+			'versioned url' => [
+				'config' => [
+					'ResourceBasePath' => '/w',
+					'Logo' => '/w/test.jpg',
+					'LogoHD' => false,
+					'UploadPath' => '/w/images',
+				],
+				'expected' => '/w/test.jpg?edcf2',
+				'baseDir' => dirname( dirname( __DIR__ ) ) . '/data/media',
+			],
+		];
+	}
 }