From: Adrian Heine <adrian.heine@wikimedia.de>
Date: Thu, 8 Jan 2015 08:56:10 +0000 (+0100)
Subject: Fix typo references in comments to ResourceLoaderStartUpModule
X-Git-Tag: 1.31.0-rc.0~12750^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=a600ea6705d06f3b26a1061cfeab48ace3253cfc;p=lhc%2Fweb%2Fwiklou.git

Fix typo references in comments to ResourceLoaderStartUpModule

Change-Id: I73436f76d0b42f6f9c0b3277a1b07fb6c2d7eb81
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 6bf93f49ac..90f91e9762 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -499,7 +499,7 @@
 		 *
 		 * @property {mw.Map} config
 		 */
-		// Dummy placeholder. Re-assigned in ResourceLoaderStartupModule to an instance of `mw.Map`.
+		// Dummy placeholder. Re-assigned in ResourceLoaderStartUpModule to an instance of `mw.Map`.
 		config: null,
 
 		/**
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
new file mode 100644
index 0000000000..7f3506cc2d
--- /dev/null
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
@@ -0,0 +1,388 @@
+<?php
+
+class ResourceLoaderStartUpModuleTest extends ResourceLoaderTestCase {
+
+	public static function provideGetModuleRegistrations() {
+		return array(
+			array( array(
+				'msg' => 'Empty registry',
+				'modules' => array(),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php"
+} );mw.loader.register( [] );'
+			) ),
+			array( array(
+				'msg' => 'Basic registry',
+				'modules' => array(
+					'test.blank' => new ResourceLoaderTestModule(),
+				),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.blank",
+        1388534400
+    ]
+] );',
+			) ),
+			array( array(
+				'msg' => 'Group signature',
+				'modules' => array(
+					'test.blank' => new ResourceLoaderTestModule(),
+					'test.group.foo' => new ResourceLoaderTestModule( array( 'group' => 'x-foo' ) ),
+					'test.group.bar' => new ResourceLoaderTestModule( array( 'group' => 'x-bar' ) ),
+				),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.blank",
+        1388534400
+    ],
+    [
+        "test.group.foo",
+        1388534400,
+        [],
+        "x-foo"
+    ],
+    [
+        "test.group.bar",
+        1388534400,
+        [],
+        "x-bar"
+    ]
+] );'
+			) ),
+			array( array(
+				'msg' => 'Different target (non-test should not be registered)',
+				'modules' => array(
+					'test.blank' => new ResourceLoaderTestModule(),
+					'test.target.foo' => new ResourceLoaderTestModule( array( 'targets' => array( 'x-foo' ) ) ),
+				),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.blank",
+        1388534400
+    ]
+] );'
+			) ),
+			array( array(
+				'msg' => 'Foreign source',
+				'sources' => array(
+					'example' => array(
+						'loadScript' => 'http://example.org/w/load.php',
+						'apiScript' => 'http://example.org/w/api.php',
+					),
+				),
+				'modules' => array(
+					'test.blank' => new ResourceLoaderTestModule( array( 'source' => 'example' ) ),
+				),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php",
+    "example": "http://example.org/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.blank",
+        1388534400,
+        [],
+        null,
+        "example"
+    ]
+] );'
+			) ),
+			array( array(
+				'msg' => 'Conditional dependency function',
+				'modules' => array(
+					'test.x.core' => new ResourceLoaderTestModule(),
+					'test.x.polyfill' => new ResourceLoaderTestModule( array(
+						'skipFunction' => 'return true;'
+					) ),
+					'test.y.polyfill' => new ResourceLoaderTestModule( array(
+						'skipFunction' =>
+							'return !!(' .
+							'    window.JSON &&' .
+							'    JSON.parse &&' .
+							'    JSON.stringify' .
+							');'
+					) ),
+					'test.z.foo' => new ResourceLoaderTestModule( array(
+						'dependencies' => array(
+							'test.x.core',
+							'test.x.polyfill',
+							'test.y.polyfill',
+						),
+					) ),
+				),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.x.core",
+        1388534400
+    ],
+    [
+        "test.x.polyfill",
+        1388534400,
+        [],
+        null,
+        null,
+        "return true;"
+    ],
+    [
+        "test.y.polyfill",
+        1388534400,
+        [],
+        null,
+        null,
+        "return !!(    window.JSON \u0026\u0026    JSON.parse \u0026\u0026    JSON.stringify);"
+    ],
+    [
+        "test.z.foo",
+        1388534400,
+        [
+            0,
+            1,
+            2
+        ]
+    ]
+] );',
+			) ),
+			array( array(
+				// This may seem like an edge case, but a plain MediaWiki core install
+				// with a few extensions installed is likely far more complex than this
+				// even, not to mention an install like Wikipedia.
+				// TODO: Make this even more realistic.
+				'msg' => 'Advanced (everything combined)',
+				'sources' => array(
+					'example' => array(
+						'loadScript' => 'http://example.org/w/load.php',
+						'apiScript' => 'http://example.org/w/api.php',
+					),
+				),
+				'modules' => array(
+					'test.blank' => new ResourceLoaderTestModule(),
+					'test.x.core' => new ResourceLoaderTestModule(),
+					'test.x.util' => new ResourceLoaderTestModule( array(
+						'dependencies' => array(
+							'test.x.core',
+						),
+					) ),
+					'test.x.foo' => new ResourceLoaderTestModule( array(
+						'dependencies' => array(
+							'test.x.core',
+						),
+					) ),
+					'test.x.bar' => new ResourceLoaderTestModule( array(
+						'dependencies' => array(
+							'test.x.core',
+							'test.x.util',
+						),
+					) ),
+					'test.x.quux' => new ResourceLoaderTestModule( array(
+						'dependencies' => array(
+							'test.x.foo',
+							'test.x.bar',
+							'test.x.util',
+							'test.x.unknown',
+						),
+					) ),
+					'test.group.foo.1' => new ResourceLoaderTestModule( array(
+						'group' => 'x-foo',
+					) ),
+					'test.group.foo.2' => new ResourceLoaderTestModule( array(
+						'group' => 'x-foo',
+					) ),
+					'test.group.bar.1' => new ResourceLoaderTestModule( array(
+						'group' => 'x-bar',
+					) ),
+					'test.group.bar.2' => new ResourceLoaderTestModule( array(
+						'group' => 'x-bar',
+						'source' => 'example',
+					) ),
+					'test.target.foo' => new ResourceLoaderTestModule( array(
+						'targets' => array( 'x-foo' ),
+					) ),
+					'test.target.bar' => new ResourceLoaderTestModule( array(
+						'source' => 'example',
+						'targets' => array( 'x-foo' ),
+					) ),
+				),
+				'out' => '
+mw.loader.addSource( {
+    "local": "/w/load.php",
+    "example": "http://example.org/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.blank",
+        1388534400
+    ],
+    [
+        "test.x.core",
+        1388534400
+    ],
+    [
+        "test.x.util",
+        1388534400,
+        [
+            1
+        ]
+    ],
+    [
+        "test.x.foo",
+        1388534400,
+        [
+            1
+        ]
+    ],
+    [
+        "test.x.bar",
+        1388534400,
+        [
+            2
+        ]
+    ],
+    [
+        "test.x.quux",
+        1388534400,
+        [
+            3,
+            4,
+            "test.x.unknown"
+        ]
+    ],
+    [
+        "test.group.foo.1",
+        1388534400,
+        [],
+        "x-foo"
+    ],
+    [
+        "test.group.foo.2",
+        1388534400,
+        [],
+        "x-foo"
+    ],
+    [
+        "test.group.bar.1",
+        1388534400,
+        [],
+        "x-bar"
+    ],
+    [
+        "test.group.bar.2",
+        1388534400,
+        [],
+        "x-bar",
+        "example"
+    ]
+] );'
+			) ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetModuleRegistrations
+	 * @covers ResourceLoaderStartUpModule::compileUnresolvedDependencies
+	 * @covers ResourceLoaderStartUpModule::getModuleRegistrations
+	 * @covers ResourceLoader::makeLoaderSourcesScript
+	 * @covers ResourceLoader::makeLoaderRegisterScript
+	 */
+	public function testGetModuleRegistrations( $case ) {
+		if ( isset( $case['sources'] ) ) {
+			$this->setMwGlobals( 'wgResourceLoaderSources', $case['sources'] );
+		}
+
+		$context = $this->getResourceLoaderContext();
+		$rl = $context->getResourceLoader();
+
+		$rl->register( $case['modules'] );
+
+		$module = new ResourceLoaderStartUpModule();
+		$this->assertEquals(
+			ltrim( $case['out'], "\n" ),
+			$module->getModuleRegistrations( $context ),
+			$case['msg']
+		);
+	}
+
+	public static function provideRegistrations() {
+		return array(
+			array( array(
+				'test.blank' => new ResourceLoaderTestModule(),
+				'test.min' => new ResourceLoaderTestModule( array(
+					'skipFunction' =>
+						'return !!(' .
+						'    window.JSON &&' .
+						'    JSON.parse &&' .
+						'    JSON.stringify' .
+						');',
+					'dependencies' => array(
+						'test.blank',
+					),
+				) ),
+			) )
+		);
+	}
+	/**
+	 * @dataProvider provideRegistrations
+	 */
+	public function testRegistrationsMinified( $modules ) {
+		$this->setMwGlobals( 'wgResourceLoaderDebug', false );
+
+		$context = $this->getResourceLoaderContext();
+		$rl = $context->getResourceLoader();
+		$rl->register( $modules );
+		$module = new ResourceLoaderStartUpModule();
+		$this->assertEquals(
+'mw.loader.addSource({"local":"/w/load.php"});'
+. 'mw.loader.register(['
+. '["test.blank",1388534400],'
+. '["test.min",1388534400,[0],null,null,'
+. '"return!!(window.JSON\u0026\u0026JSON.parse\u0026\u0026JSON.stringify);"'
+. ']]);',
+			$module->getModuleRegistrations( $context ),
+			'Minified output'
+		);
+	}
+
+	/**
+	 * @dataProvider provideRegistrations
+	 */
+	public function testRegistrationsUnminified( $modules ) {
+		$context = $this->getResourceLoaderContext();
+		$rl = $context->getResourceLoader();
+		$rl->register( $modules );
+		$module = new ResourceLoaderStartUpModule();
+		$this->assertEquals(
+'mw.loader.addSource( {
+    "local": "/w/load.php"
+} );mw.loader.register( [
+    [
+        "test.blank",
+        1388534400
+    ],
+    [
+        "test.min",
+        1388534400,
+        [
+            0
+        ],
+        null,
+        null,
+        "return !!(    window.JSON \u0026\u0026    JSON.parse \u0026\u0026    JSON.stringify);"
+    ]
+] );',
+			$module->getModuleRegistrations( $context ),
+			'Unminified output'
+		);
+	}
+
+}
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderStartupModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderStartupModuleTest.php
deleted file mode 100644
index 69854d5b84..0000000000
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartupModuleTest.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-
-class ResourceLoaderStartupModuleTest extends ResourceLoaderTestCase {
-
-	public static function provideGetModuleRegistrations() {
-		return array(
-			array( array(
-				'msg' => 'Empty registry',
-				'modules' => array(),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php"
-} );mw.loader.register( [] );'
-			) ),
-			array( array(
-				'msg' => 'Basic registry',
-				'modules' => array(
-					'test.blank' => new ResourceLoaderTestModule(),
-				),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.blank",
-        1388534400
-    ]
-] );',
-			) ),
-			array( array(
-				'msg' => 'Group signature',
-				'modules' => array(
-					'test.blank' => new ResourceLoaderTestModule(),
-					'test.group.foo' => new ResourceLoaderTestModule( array( 'group' => 'x-foo' ) ),
-					'test.group.bar' => new ResourceLoaderTestModule( array( 'group' => 'x-bar' ) ),
-				),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.blank",
-        1388534400
-    ],
-    [
-        "test.group.foo",
-        1388534400,
-        [],
-        "x-foo"
-    ],
-    [
-        "test.group.bar",
-        1388534400,
-        [],
-        "x-bar"
-    ]
-] );'
-			) ),
-			array( array(
-				'msg' => 'Different target (non-test should not be registered)',
-				'modules' => array(
-					'test.blank' => new ResourceLoaderTestModule(),
-					'test.target.foo' => new ResourceLoaderTestModule( array( 'targets' => array( 'x-foo' ) ) ),
-				),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.blank",
-        1388534400
-    ]
-] );'
-			) ),
-			array( array(
-				'msg' => 'Foreign source',
-				'sources' => array(
-					'example' => array(
-						'loadScript' => 'http://example.org/w/load.php',
-						'apiScript' => 'http://example.org/w/api.php',
-					),
-				),
-				'modules' => array(
-					'test.blank' => new ResourceLoaderTestModule( array( 'source' => 'example' ) ),
-				),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php",
-    "example": "http://example.org/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.blank",
-        1388534400,
-        [],
-        null,
-        "example"
-    ]
-] );'
-			) ),
-			array( array(
-				'msg' => 'Conditional dependency function',
-				'modules' => array(
-					'test.x.core' => new ResourceLoaderTestModule(),
-					'test.x.polyfill' => new ResourceLoaderTestModule( array(
-						'skipFunction' => 'return true;'
-					) ),
-					'test.y.polyfill' => new ResourceLoaderTestModule( array(
-						'skipFunction' =>
-							'return !!(' .
-							'    window.JSON &&' .
-							'    JSON.parse &&' .
-							'    JSON.stringify' .
-							');'
-					) ),
-					'test.z.foo' => new ResourceLoaderTestModule( array(
-						'dependencies' => array(
-							'test.x.core',
-							'test.x.polyfill',
-							'test.y.polyfill',
-						),
-					) ),
-				),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.x.core",
-        1388534400
-    ],
-    [
-        "test.x.polyfill",
-        1388534400,
-        [],
-        null,
-        null,
-        "return true;"
-    ],
-    [
-        "test.y.polyfill",
-        1388534400,
-        [],
-        null,
-        null,
-        "return !!(    window.JSON \u0026\u0026    JSON.parse \u0026\u0026    JSON.stringify);"
-    ],
-    [
-        "test.z.foo",
-        1388534400,
-        [
-            0,
-            1,
-            2
-        ]
-    ]
-] );',
-			) ),
-			array( array(
-				// This may seem like an edge case, but a plain MediaWiki core install
-				// with a few extensions installed is likely far more complex than this
-				// even, not to mention an install like Wikipedia.
-				// TODO: Make this even more realistic.
-				'msg' => 'Advanced (everything combined)',
-				'sources' => array(
-					'example' => array(
-						'loadScript' => 'http://example.org/w/load.php',
-						'apiScript' => 'http://example.org/w/api.php',
-					),
-				),
-				'modules' => array(
-					'test.blank' => new ResourceLoaderTestModule(),
-					'test.x.core' => new ResourceLoaderTestModule(),
-					'test.x.util' => new ResourceLoaderTestModule( array(
-						'dependencies' => array(
-							'test.x.core',
-						),
-					) ),
-					'test.x.foo' => new ResourceLoaderTestModule( array(
-						'dependencies' => array(
-							'test.x.core',
-						),
-					) ),
-					'test.x.bar' => new ResourceLoaderTestModule( array(
-						'dependencies' => array(
-							'test.x.core',
-							'test.x.util',
-						),
-					) ),
-					'test.x.quux' => new ResourceLoaderTestModule( array(
-						'dependencies' => array(
-							'test.x.foo',
-							'test.x.bar',
-							'test.x.util',
-							'test.x.unknown',
-						),
-					) ),
-					'test.group.foo.1' => new ResourceLoaderTestModule( array(
-						'group' => 'x-foo',
-					) ),
-					'test.group.foo.2' => new ResourceLoaderTestModule( array(
-						'group' => 'x-foo',
-					) ),
-					'test.group.bar.1' => new ResourceLoaderTestModule( array(
-						'group' => 'x-bar',
-					) ),
-					'test.group.bar.2' => new ResourceLoaderTestModule( array(
-						'group' => 'x-bar',
-						'source' => 'example',
-					) ),
-					'test.target.foo' => new ResourceLoaderTestModule( array(
-						'targets' => array( 'x-foo' ),
-					) ),
-					'test.target.bar' => new ResourceLoaderTestModule( array(
-						'source' => 'example',
-						'targets' => array( 'x-foo' ),
-					) ),
-				),
-				'out' => '
-mw.loader.addSource( {
-    "local": "/w/load.php",
-    "example": "http://example.org/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.blank",
-        1388534400
-    ],
-    [
-        "test.x.core",
-        1388534400
-    ],
-    [
-        "test.x.util",
-        1388534400,
-        [
-            1
-        ]
-    ],
-    [
-        "test.x.foo",
-        1388534400,
-        [
-            1
-        ]
-    ],
-    [
-        "test.x.bar",
-        1388534400,
-        [
-            2
-        ]
-    ],
-    [
-        "test.x.quux",
-        1388534400,
-        [
-            3,
-            4,
-            "test.x.unknown"
-        ]
-    ],
-    [
-        "test.group.foo.1",
-        1388534400,
-        [],
-        "x-foo"
-    ],
-    [
-        "test.group.foo.2",
-        1388534400,
-        [],
-        "x-foo"
-    ],
-    [
-        "test.group.bar.1",
-        1388534400,
-        [],
-        "x-bar"
-    ],
-    [
-        "test.group.bar.2",
-        1388534400,
-        [],
-        "x-bar",
-        "example"
-    ]
-] );'
-			) ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideGetModuleRegistrations
-	 * @covers ResourceLoaderStartupModule::compileUnresolvedDependencies
-	 * @covers ResourceLoaderStartUpModule::getModuleRegistrations
-	 * @covers ResourceLoader::makeLoaderSourcesScript
-	 * @covers ResourceLoader::makeLoaderRegisterScript
-	 */
-	public function testGetModuleRegistrations( $case ) {
-		if ( isset( $case['sources'] ) ) {
-			$this->setMwGlobals( 'wgResourceLoaderSources', $case['sources'] );
-		}
-
-		$context = $this->getResourceLoaderContext();
-		$rl = $context->getResourceLoader();
-
-		$rl->register( $case['modules'] );
-
-		$module = new ResourceLoaderStartUpModule();
-		$this->assertEquals(
-			ltrim( $case['out'], "\n" ),
-			$module->getModuleRegistrations( $context ),
-			$case['msg']
-		);
-	}
-
-	public static function provideRegistrations() {
-		return array(
-			array( array(
-				'test.blank' => new ResourceLoaderTestModule(),
-				'test.min' => new ResourceLoaderTestModule( array(
-					'skipFunction' =>
-						'return !!(' .
-						'    window.JSON &&' .
-						'    JSON.parse &&' .
-						'    JSON.stringify' .
-						');',
-					'dependencies' => array(
-						'test.blank',
-					),
-				) ),
-			) )
-		);
-	}
-	/**
-	 * @dataProvider provideRegistrations
-	 */
-	public function testRegistrationsMinified( $modules ) {
-		$this->setMwGlobals( 'wgResourceLoaderDebug', false );
-
-		$context = $this->getResourceLoaderContext();
-		$rl = $context->getResourceLoader();
-		$rl->register( $modules );
-		$module = new ResourceLoaderStartUpModule();
-		$this->assertEquals(
-'mw.loader.addSource({"local":"/w/load.php"});'
-. 'mw.loader.register(['
-. '["test.blank",1388534400],'
-. '["test.min",1388534400,[0],null,null,'
-. '"return!!(window.JSON\u0026\u0026JSON.parse\u0026\u0026JSON.stringify);"'
-. ']]);',
-			$module->getModuleRegistrations( $context ),
-			'Minified output'
-		);
-	}
-
-	/**
-	 * @dataProvider provideRegistrations
-	 */
-	public function testRegistrationsUnminified( $modules ) {
-		$context = $this->getResourceLoaderContext();
-		$rl = $context->getResourceLoader();
-		$rl->register( $modules );
-		$module = new ResourceLoaderStartUpModule();
-		$this->assertEquals(
-'mw.loader.addSource( {
-    "local": "/w/load.php"
-} );mw.loader.register( [
-    [
-        "test.blank",
-        1388534400
-    ],
-    [
-        "test.min",
-        1388534400,
-        [
-            0
-        ],
-        null,
-        null,
-        "return !!(    window.JSON \u0026\u0026    JSON.parse \u0026\u0026    JSON.stringify);"
-    ]
-] );',
-			$module->getModuleRegistrations( $context ),
-			'Unminified output'
-		);
-	}
-
-}