From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 17 Nov 2016 01:46:03 +0000 (+0000)
Subject: Merge "resourceloader: Add tests to verify empty string works"
X-Git-Tag: 1.31.0-rc.0~4834
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=bcea7fcb1c37d25e0949f77a8bde84c0a8b34ca4;hp=81a45b2b0e76e3189c47cd1f96d35ea87c64e6f7;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Add tests to verify empty string works"
---

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index c24a3211e7..1ecdf21d92 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -51,6 +51,16 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 		$this->assertEquals( $module, $resourceLoader->getModule( 'test' ) );
 	}
 
+	/**
+	 * @covers ResourceLoader::register
+	 */
+	public function testRegisterEmptyString() {
+		$module = new ResourceLoaderTestModule();
+		$resourceLoader = new EmptyResourceLoader();
+		$resourceLoader->register( '', $module );
+		$this->assertEquals( $module, $resourceLoader->getModule( '' ) );
+	}
+
 	/**
 	 * @covers ResourceLoader::register
 	 */
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index 7233a2ed7d..505d9a17fb 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -601,6 +601,25 @@
 		mw.loader.load( target );
 	} );
 
+	QUnit.test( 'Empty string module name - T28804', function ( assert ) {
+		var done = false;
+
+		assert.strictEqual( mw.loader.getState( '' ), null, 'State (unregistered)' );
+
+		mw.loader.register( '', 'v1' );
+		assert.strictEqual( mw.loader.getState( '' ), 'registered', 'State (registered)' );
+		assert.strictEqual( mw.loader.getVersion( '' ), 'v1', 'Version' );
+
+		mw.loader.implement( '', function () {
+			done = true;
+		} );
+
+		return mw.loader.using( '', function () {
+			assert.strictEqual( done, true, 'script ran' );
+			assert.strictEqual( mw.loader.getState( '' ), 'ready', 'State (ready)' );
+		} );
+	} );
+
 	QUnit.test( 'Executing race - T112232', 2, function ( assert ) {
 		var done = false;