X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=035a208131a000415300bc7135500be7fea0da27;hb=90334a48728b55927c5fcd1468926fd2a6cbdf43;hp=a292d0b377552179650de926530b5d880dc915a7;hpb=badc035712ded02e8ec7ee4c5e8a0fe09e2811d2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index a292d0b377..035a208131 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,42 +12,23 @@ module.exports = function ( grunt ) {
 		wgScriptPath = process.env.MW_SCRIPT_PATH,
 		karmaProxy = {};
 
-	karmaProxy[wgScriptPath] = wgServer + wgScriptPath;
+	karmaProxy[ wgScriptPath ] = wgServer + wgScriptPath;
 
 	grunt.initConfig( {
-		pkg: grunt.file.readJSON( 'package.json' ),
 		jshint: {
 			options: {
 				jshintrc: true
 			},
-			all: [
-				'*.js',
-				'{includes,languages,resources,tests}/**/*.js'
-			]
+			all: '.'
 		},
 		jscs: {
-			all: [
-				'<%= jshint.all %>',
-				// Auto-generated file with JSON (double quotes)
-				'!tests/qunit/data/mediawiki.jqueryMsg.data.js',
-				// Skip functions are stored as script files but wrapped in a function when
-				// executed. node-jscs trips on the would-be "Illegal return statement".
-				'!resources/src/*-skip.js'
-
-			// Exclude all files ignored by jshint
-			].concat( grunt.file.read( '.jshintignore' ).split( '\n' ).reduce( function ( patterns, pattern ) {
-				// Filter out empty lines
-				if ( pattern.length && pattern[0] !== '#' ) {
-					patterns.push( '!' + pattern );
-				}
-				return patterns;
-			}, [] ) )
+			all: '.'
 		},
 		jsonlint: {
 			all: [
 				'.jscsrc',
-				'{languages,maintenance,resources}/**/*.json',
-				'package.json'
+				'**/*.json',
+				'!{docs/js,extensions,node_modules,skins,vendor}/**'
 			]
 		},
 		banana: {
@@ -57,10 +38,9 @@ module.exports = function ( grunt ) {
 		},
 		watch: {
 			files: [
-				'<%= jscs.all %>',
-				'<%= jsonlint.all %>',
-				'.jshintignore',
-				'.jshintrc'
+				'.js*',
+				'**/*',
+				'!{docs,extensions,node_modules,skins,vendor}/**'
 			],
 			tasks: 'test'
 		},
@@ -76,7 +56,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' ]
@@ -97,9 +79,22 @@ module.exports = function ( grunt ) {
 		}
 	} );
 
-	grunt.registerTask( 'lint', ['jshint', 'jscs', 'jsonlint', 'banana'] );
-	grunt.registerTask( 'qunit', 'karma:main' );
+	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', [ 'assert-mw-env', 'karma:main' ] );
 
-	grunt.registerTask( 'test', ['lint'] );
+	grunt.registerTask( 'test', [ 'lint' ] );
 	grunt.registerTask( 'default', 'test' );
 };