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

diff --git a/Gruntfile.js b/Gruntfile.js
index 1ecc2c032f..cb9a20d0a7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,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'
 			]
 		},
@@ -64,9 +62,6 @@ module.exports = function ( grunt ) {
 			installer: 'includes/installer/i18n/'
 		},
 		stylelint: {
-			options: {
-				syntax: 'less'
-			},
 			src: '{resources/src,mw-config}/**/*.{css,less}'
 		},
 		watch: {
@@ -88,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' ]
@@ -100,8 +98,8 @@ module.exports = function ( grunt ) {
 			chromium: {
 				browsers: [ 'Chromium' ]
 			},
-			more: {
-				browsers: [ 'Chrome', 'Firefox' ]
+			firefox: {
+				browsers: [ 'Firefox' ]
 			}
 		},
 		copy: {