X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=69a123cc9f443765702ab84676623a7b9b8ab6fa;hb=9a4c32d093cb10f313bf2e7d14c07646de73c228;hp=1ecc2c032fab3e0d7dab7c429c4ff882a31f8741;hpb=4f9d78c64942584d12d0ca3fb7f3de417f663408;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 1ecc2c032f..69a123cc9f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,7 +4,6 @@ module.exports = function ( grunt ) {
 
 	var wgServer = process.env.MW_SERVER,
 		wgScriptPath = process.env.MW_SCRIPT_PATH,
-		WebdriverIOconfigFile,
 		karmaProxy = {};
 
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
@@ -21,12 +20,6 @@ module.exports = function ( grunt ) {
 		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: [
@@ -44,8 +37,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'
 			]
 		},
@@ -64,9 +55,6 @@ module.exports = function ( grunt ) {
 			installer: 'includes/installer/i18n/'
 		},
 		stylelint: {
-			options: {
-				syntax: 'less'
-			},
 			src: '{resources/src,mw-config}/**/*.{css,less}'
 		},
 		watch: {
@@ -88,11 +76,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' ]
@@ -100,8 +91,8 @@ module.exports = function ( grunt ) {
 			chromium: {
 				browsers: [ 'Chromium' ]
 			},
-			more: {
-				browsers: [ 'Chrome', 'Firefox' ]
+			firefox: {
+				browsers: [ 'Firefox' ]
 			}
 		},
 		copy: {
@@ -118,7 +109,7 @@ module.exports = function ( grunt ) {
 		// Configure WebdriverIO task
 		webdriver: {
 			test: {
-				configFile: WebdriverIOconfigFile
+				configFile: './tests/selenium/wdio.conf.js'
 			}
 		}