X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fresourceloader%2FResourceLoaderTest.php;h=f0c97f4546cd5f231e63c83e7be8a8497f87194c;hp=ac4a1ca1bb381099152f2b67fad6d00fb6334144;hb=46072ba301ea98f6e19487ce84c6fd8cc0d403f1;hpb=7b69a2b340c643ec28138c29e60d4632fafc7939

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index ac4a1ca1bb..f0c97f4546 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -18,8 +18,6 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 	 * @coversNothing
 	 */
 	public function testServiceWiring() {
-		$this->overrideMwServices();
-
 		$ranHook = 0;
 		$this->setMwGlobals( 'wgHooks', [
 			'ResourceLoaderRegisterModules' => [
@@ -520,13 +518,14 @@ END
 			'wrap' => true,
 			'styles' => [], 'templates' => [], 'messages' => new XmlJsCode( '{}' ), 'packageFiles' => [],
 		];
-		ResourceLoader::clearCache();
-		$this->setMwGlobals( 'wgResourceLoaderDebug', true );
-
 		$rl = TestingAccessWrapper::newFromClass( ResourceLoader::class );
+		$context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest( [
+			'debug' => 'true',
+		] ) );
 		$this->assertEquals(
 			$case['expected'],
 			$rl->makeLoaderImplementScript(
+				$context,
 				$case['name'],
 				( $case['wrap'] && is_string( $case['scripts'] ) )
 					? new XmlJsCode( $case['scripts'] )
@@ -545,7 +544,9 @@ END
 	public function testMakeLoaderImplementScriptInvalid() {
 		$this->setExpectedException( MWException::class, 'Invalid scripts error' );
 		$rl = TestingAccessWrapper::newFromClass( ResourceLoader::class );
+		$context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest() );
 		$rl->makeLoaderImplementScript(
+			$context,
 			'test', // name
 			123, // scripts
 			null, // styles
@@ -559,6 +560,9 @@ END
 	 * @covers ResourceLoader::makeLoaderRegisterScript
 	 */
 	public function testMakeLoaderRegisterScript() {
+		$context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest( [
+			'debug' => 'true',
+		] ) );
 		$this->assertEquals(
 			'mw.loader.register([
     [
@@ -566,7 +570,7 @@ END
         "1234567"
     ]
 ]);',
-			ResourceLoader::makeLoaderRegisterScript( [
+			ResourceLoader::makeLoaderRegisterScript( $context, [
 				[ 'test.name', '1234567' ],
 			] ),
 			'Nested array parameter'
@@ -602,7 +606,7 @@ END
         "return true;"
     ]
 ]);',
-			ResourceLoader::makeLoaderRegisterScript( [
+			ResourceLoader::makeLoaderRegisterScript( $context, [
 				[ 'test.foo', '100' , [], null, null ],
 				[ 'test.bar', '200', [ 'test.unknown' ], null ],
 				[ 'test.baz', '300', [ 'test.quux', 'test.foo' ], null ],
@@ -616,31 +620,34 @@ END
 	 * @covers ResourceLoader::makeLoaderSourcesScript
 	 */
 	public function testMakeLoaderSourcesScript() {
+		$context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest( [
+			'debug' => 'true',
+		] ) );
 		$this->assertEquals(
 			'mw.loader.addSource({
     "local": "/w/load.php"
 });',
-			ResourceLoader::makeLoaderSourcesScript( 'local', '/w/load.php' )
+			ResourceLoader::makeLoaderSourcesScript( $context, 'local', '/w/load.php' )
 		);
 		$this->assertEquals(
 			'mw.loader.addSource({
     "local": "/w/load.php"
 });',
-			ResourceLoader::makeLoaderSourcesScript( [ 'local' => '/w/load.php' ] )
+			ResourceLoader::makeLoaderSourcesScript( $context, [ 'local' => '/w/load.php' ] )
 		);
 		$this->assertEquals(
 			'mw.loader.addSource({
     "local": "/w/load.php",
     "example": "https://example.org/w/load.php"
 });',
-			ResourceLoader::makeLoaderSourcesScript( [
+			ResourceLoader::makeLoaderSourcesScript( $context, [
 				'local' => '/w/load.php',
 				'example' => 'https://example.org/w/load.php'
 			] )
 		);
 		$this->assertEquals(
 			'mw.loader.addSource([]);',
-			ResourceLoader::makeLoaderSourcesScript( [] )
+			ResourceLoader::makeLoaderSourcesScript( $context, [] )
 		);
 	}
 
@@ -720,14 +727,14 @@ END
 		] );
 		$context = $this->getResourceLoaderContext( [], $rl );
 
-		$this->assertEquals(
+		$this->assertSame(
 			'',
 			$rl->getCombinedVersion( $context, [] ),
 			'empty list'
 		);
 
 		$this->assertEquals(
-			ResourceLoader::makeHash( self::BLANK_VERSION ),
+			self::BLANK_COMBI,
 			$rl->getCombinedVersion( $context, [ 'foo' ] ),
 			'compute foo'
 		);