Merge pull request #14 from wmde/decoupletests

Decoupled QUnit tests from ResourceLoader

Author: addshore

.jshintignore

@@ -0,0 +1,3 @@
+./lib/jquery/*
+./lib/qunit/*
+./lib/require/*

.jshintrc

@@ -36,6 +36,10 @@
 		"valueFormatters",
 		"valueParsers",
 		"time",
-		"util"
+		"util",
+		// require.js globals:
+		"require",
+		"requirejs",
+		"define"
 	]
 }

DataValuesJavascript.php

@@ -43,7 +43,7 @@
 $GLOBALS['wgValueParsers'] = array();
 
 /**
- * Hook for registering QUnit test cases.
+ * Register QUnit test base classes used by test modules in dependent components.
  * @see https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules
  * @since 0.1
  *
@@ -55,13 +55,35 @@
 	array &$testModules,
 	\ResourceLoader &$resourceLoader
 ) {
-	$testModules['qunit'] = array_merge(
-		$testModules['qunit'],
-		include( __DIR__ . '/tests/lib/resources.php' ),
-		include( __DIR__ . '/tests/src/resources.php' ),
-		include( __DIR__ . '/tests/src/valueFormatters/resources.php' ),
-		include( __DIR__ . '/tests/src/valueParsers/resources.php' )
+
+	$moduleTemplate = array(
+		'localBasePath' => __DIR__ . '/test',
+		'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ) . '/tests',
 	);
 
+	$testModuleTemplates = array(
+
+		'valueFormatters.tests' => $moduleTemplate + array(
+			'scripts' => array(
+				'src/valueFormatters/valueFormatters.tests.js',
+			),
+			'dependencies' => array(
+				'valueFormatters',
+			),
+		),
+
+		'valueParsers.tests' => $moduleTemplate + array(
+			'scripts' => array(
+				'src/valueParsers/valueParsers.tests.js',
+			),
+			'dependencies' => array(
+				'valueParsers.parsers',
+			),
+		),
+
+	);
+
+	$testModules['qunit'] = array_merge( $testModules['qunit'], $testModuleTemplates );
+
 	return true;
 };