X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=dbbfcb814eb5dda249d3d667a806a5e74611e298;hb=844d724621693faefe99311e882396c78e31189f;hp=354f0483b615d0986739df2738e1fc9148a6c51d;hpb=fa7279c78d5b8460668d293e5fac226689bccdb5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 354f0483b6..dbbfcb814e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,32 +1,54 @@
-/*jshint node:true */
+/* eslint-env node */
+
 module.exports = function ( grunt ) {
+
+	var wgServer = process.env.MW_SERVER,
+		wgScriptPath = process.env.MW_SCRIPT_PATH,
+		WebdriverIOconfigFile,
+		karmaProxy = {};
+
+	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-contrib-copy' );
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
-	grunt.loadNpmTasks( 'grunt-banana-checker' );
-	grunt.loadNpmTasks( 'grunt-jscs' );
+	grunt.loadNpmTasks( 'grunt-eslint' );
 	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-karma' );
+	grunt.loadNpmTasks( 'grunt-stylelint' );
+	grunt.loadNpmTasks( 'grunt-webdriver' );
 
-	var wgServer = process.env.MW_SERVER,
-		wgScriptPath = process.env.MW_SCRIPT_PATH,
-		karmaProxy = {};
+	karmaProxy[ wgScriptPath ] = {
+		target: wgServer + wgScriptPath,
+		changeOrigin: true
+	};
 
-	karmaProxy[ wgScriptPath ] = wgServer + wgScriptPath;
+	if ( process.env.JENKINS_HOME ) {
+		WebdriverIOconfigFile = './tests/selenium/wdio.conf.jenkins.js';
+	} else {
+		WebdriverIOconfigFile = './tests/selenium/wdio.conf.js';
+	}
 
 	grunt.initConfig( {
-		jshint: {
-			options: {
-				jshintrc: true
-			},
-			all: '.'
-		},
-		jscs: {
-			all: '.'
+		eslint: {
+			all: [
+				'**/*.js',
+				'!docs/**',
+				'!node_modules/**',
+				'!resources/lib/**',
+				'!resources/src/jquery.tipsy/**',
+				'!resources/src/jquery/jquery.farbtastic.js',
+				'!resources/src/mediawiki.libs/**',
+				// Third-party code of PHPUnit coverage report
+				'!tests/coverage/**',
+				'!vendor/**',
+				// Explicitly say "**/*.js" here in case of symlinks
+				'!extensions/**/*.js',
+				'!skins/**/*.js',
+				// Skip functions aren't even parseable
+				'!resources/src/mediawiki.hidpi-skip.js'
+			]
 		},
 		jsonlint: {
 			all: [
-				'.jscsrc',
 				'**/*.json',
 				'!{docs/js,extensions,node_modules,skins,vendor}/**'
 			]
@@ -39,9 +61,15 @@ module.exports = function ( grunt ) {
 			api: 'includes/api/i18n/',
 			installer: 'includes/installer/i18n/'
 		},
+		stylelint: {
+			options: {
+				syntax: 'less'
+			},
+			src: '{resources/src,mw-config}/**/*.{css,less}'
+		},
 		watch: {
 			files: [
-				'.js*',
+				'.{stylelintrc,eslintrc.json}',
 				'**/*',
 				'!{docs,extensions,node_modules,skins,vendor}/**'
 			],
@@ -58,15 +86,21 @@ module.exports = function ( grunt ) {
 				} ],
 				logLevel: 'DEBUG',
 				frameworks: [ 'qunit' ],
-				reporters: [ 'progress' ],
+				reporters: [ 'mocha' ],
 				singleRun: true,
 				autoWatch: false,
 				// Some tests in extensions don't yield for more than the default 10s (T89075)
-				browserNoActivityTimeout: 60 * 1000
+				browserNoActivityTimeout: 60 * 1000,
+				// Karma requires Same-Origin (or CORS) by default since v1.1.1
+				// for better stacktraces. But we load the first request from wgServer
+				crossOriginAttribute: false
 			},
 			main: {
 				browsers: [ 'Chrome' ]
 			},
+			chromium: {
+				browsers: [ 'Chromium' ]
+			},
 			more: {
 				browsers: [ 'Chrome', 'Firefox' ]
 			}
@@ -80,7 +114,15 @@ module.exports = function ( grunt ) {
 					return require( 'path' ).join( dest, src.replace( 'resources/', '' ) );
 				}
 			}
+		},
+
+		// Configure WebdriverIO task
+		webdriver: {
+			test: {
+				configFile: WebdriverIOconfigFile
+			}
 		}
+
 	} );
 
 	grunt.registerTask( 'assert-mw-env', function () {
@@ -96,7 +138,7 @@ module.exports = function ( grunt ) {
 		return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
 	} );
 
-	grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'lint', [ 'eslint', 'banana', 'stylelint' ] );
 	grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
 
 	grunt.registerTask( 'test', [ 'lint' ] );