X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=573db69afb15a591d42bff5cd4e354562b8eb3df;hb=45788085afaa7be7b606c08ccc3cba06d224496b;hp=9cf89d08271ab41df77d4167247da34bd7493286;hpb=31d239f9d9e2516fc725d9b743ece0dfe72c23a2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 9cf89d0827..573db69afb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,6 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
+	grunt.loadNpmTasks( 'grunt-contrib-copy' );
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
@@ -8,7 +9,10 @@ module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-karma' );
 
 	var wgServer = process.env.MW_SERVER,
-		wgScriptPath = process.env.MW_SCRIPT_PATH;
+		wgScriptPath = process.env.MW_SCRIPT_PATH,
+		karmaProxy = {};
+
+	karmaProxy[wgScriptPath] = wgServer + wgScriptPath;
 
 	grunt.initConfig( {
 		pkg: grunt.file.readJSON( 'package.json' ),
@@ -18,7 +22,7 @@ module.exports = function ( grunt ) {
 			},
 			all: [
 				'*.js',
-				'{includes,languages,resources,skins,tests}/**/*.js'
+				'{includes,languages,resources,tests}/**/*.js'
 			]
 		},
 		jscs: {
@@ -62,27 +66,7 @@ module.exports = function ( grunt ) {
 		},
 		karma: {
 			options: {
-				proxies: ( function () {
-					var obj = {};
-					// Set up a proxy for requests to relative urls inside wgScriptPath. Uses a
-					// property accessor instead of plain obj[wgScriptPath] assignment as throw if
-					// unset. Running grunt normally (e.g. npm test), should not fail over this.
-					// This ensures 'npm test' works out of the box, statically, on a git clone
-					// without MediaWiki fully installed or some environment variables set.
-					Object.defineProperty( obj, wgScriptPath, {
-						enumerable: true,
-						get: function () {
-							if ( !wgServer ) {
-								grunt.fail.fatal( 'MW_SERVER is not set' );
-							}
-							if ( !wgScriptPath ) {
-								grunt.fail.fatal( 'MW_SCRIPT_PATH is not set' );
-							}
-							return wgServer + wgScriptPath;
-						}
-					} );
-					return obj;
-				}() ),
+				proxies: karmaProxy,
 				files: [ {
 					pattern: wgServer + wgScriptPath + '/index.php?title=Special:JavaScriptTest/qunit/export',
 					watched: false,
@@ -92,7 +76,9 @@ module.exports = function ( grunt ) {
 				frameworks: [ 'qunit' ],
 				reporters: [ 'dots' ],
 				singleRun: true,
-				autoWatch: false
+				autoWatch: false,
+				// Some tests in extensions don't yield for more than the default 10s (T89075)
+				browserNoActivityTimeout: 60 * 1000
 			},
 			main: {
 				browsers: [ 'Chrome' ]
@@ -100,11 +86,34 @@ module.exports = function ( grunt ) {
 			more: {
 				browsers: [ 'Chrome', 'Firefox' ]
 			}
+		},
+		copy: {
+			jsduck: {
+				src: 'resources/**/*',
+				dest: 'docs/js/modules',
+				expand: true,
+				rename: function ( dest, src ) {
+					return require( 'path' ).join( dest, src.replace( 'resources/', '' ) );
+				}
+			}
+		}
+	} );
+
+	grunt.registerTask( 'assert-mw-env', function () {
+		if ( !process.env.MW_SERVER ) {
+			grunt.log.error( 'Environment variable MW_SERVER must be set.\n' +
+				'Set this like $wgServer, e.g. "http://localhost"'
+			);
+		}
+		if ( !process.env.MW_SCRIPT_PATH ) {
+			grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' +
+				'Set this like $wgScriptPath, e.g. "/w"');
 		}
+		return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
 	} );
 
 	grunt.registerTask( 'lint', ['jshint', 'jscs', 'jsonlint', 'banana'] );
-	grunt.registerTask( 'qunit', 'karma:main' );
+	grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
 
 	grunt.registerTask( 'test', ['lint'] );
 	grunt.registerTask( 'default', 'test' );