dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release notes for I61749f1d864cf68afe90cd9e15ba2d7a74252501
[lhc/web/wiklou.git]
/
Gruntfile.js
diff --git
a/Gruntfile.js
b/Gruntfile.js
index
6c56772
..
69a123c
100644
(file)
--- 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,
var wgServer = process.env.MW_SERVER,
wgScriptPath = process.env.MW_SCRIPT_PATH,
- WebdriverIOconfigFile,
karmaProxy = {};
grunt.loadNpmTasks( 'grunt-banana-checker' );
karmaProxy = {};
grunt.loadNpmTasks( 'grunt-banana-checker' );
@@
-21,12
+20,6
@@
module.exports = function ( grunt ) {
changeOrigin: true
};
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: [
grunt.initConfig( {
eslint: {
all: [
@@
-44,8
+37,6
@@
module.exports = function ( grunt ) {
'!extensions/**/*.js',
'!skins/**/*.js',
// Skip functions aren't even parseable
'!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'
]
},
'!resources/src/mediawiki.hidpi-skip.js'
]
},
@@
-64,9
+55,6
@@
module.exports = function ( grunt ) {
installer: 'includes/installer/i18n/'
},
stylelint: {
installer: 'includes/installer/i18n/'
},
stylelint: {
- options: {
- syntax: 'less'
- },
src: '{resources/src,mw-config}/**/*.{css,less}'
},
watch: {
src: '{resources/src,mw-config}/**/*.{css,less}'
},
watch: {
@@
-92,7
+80,10
@@
module.exports = function ( grunt ) {
singleRun: true,
autoWatch: false,
// Some tests in extensions don't yield for more than the default 10s (T89075)
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' ]
},
main: {
browsers: [ 'Chrome' ]
@@
-100,8
+91,8
@@
module.exports = function ( grunt ) {
chromium: {
browsers: [ 'Chromium' ]
},
chromium: {
browsers: [ 'Chromium' ]
},
-
more
: {
- browsers: [ '
Chrome', '
Firefox' ]
+
firefox
: {
+ browsers: [ 'Firefox' ]
}
},
copy: {
}
},
copy: {
@@
-118,7
+109,7
@@
module.exports = function ( grunt ) {
// Configure WebdriverIO task
webdriver: {
test: {
// Configure WebdriverIO task
webdriver: {
test: {
- configFile:
WebdriverIOconfigFile
+ configFile:
'./tests/selenium/wdio.conf.js'
}
}
}
}