X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=cb9a20d0a77d4eb7140a294380578c9882902526;hb=9a37fb8e4851d13bfb208eb886c9947a7f21571c;hp=0e1c8cb2c2826d4196cbb762ccf277d5cd7a8db1;hpb=b444c2a3dfa459e7e54fd822e4d04cd9882f90e2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 0e1c8cb2c2..cb9a20d0a7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,6 +4,7 @@ module.exports = function ( grunt ) {
 
 	var wgServer = process.env.MW_SERVER,
 		wgScriptPath = process.env.MW_SCRIPT_PATH,
+		WebdriverIOconfigFile,
 		karmaProxy = {};
 
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
@@ -13,12 +14,19 @@ module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-karma' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
+	grunt.loadNpmTasks( 'grunt-webdriver' );
 
 	karmaProxy[ wgScriptPath ] = {
 		target: wgServer + wgScriptPath,
 		changeOrigin: true
 	};
 
+	if ( process.env.JENKINS_HOME ) {
+		WebdriverIOconfigFile = './tests/selenium/wdio.conf.jenkins.js';
+	} else {
+		WebdriverIOconfigFile = './tests/selenium/wdio.conf.js';
+	}
+
 	grunt.initConfig( {
 		eslint: {
 			all: [
@@ -36,8 +44,6 @@ module.exports = function ( grunt ) {
 				'!extensions/**/*.js',
 				'!skins/**/*.js',
 				// Skip functions aren't even parseable
-				'!resources/src/dom-level2-skip.js',
-				'!resources/src/es5-skip.js',
 				'!resources/src/mediawiki.hidpi-skip.js'
 			]
 		},
@@ -56,9 +62,6 @@ module.exports = function ( grunt ) {
 			installer: 'includes/installer/i18n/'
 		},
 		stylelint: {
-			options: {
-				syntax: 'less'
-			},
 			src: '{resources/src,mw-config}/**/*.{css,less}'
 		},
 		watch: {
@@ -80,11 +83,14 @@ 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' ]
@@ -92,8 +98,8 @@ module.exports = function ( grunt ) {
 			chromium: {
 				browsers: [ 'Chromium' ]
 			},
-			more: {
-				browsers: [ 'Chrome', 'Firefox' ]
+			firefox: {
+				browsers: [ 'Firefox' ]
 			}
 		},
 		copy: {
@@ -105,7 +111,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 () {