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
Merge "Show redirect fragments on Special:ListRedirects"
[lhc/web/wiklou.git]
/
Gruntfile.js
diff --git
a/Gruntfile.js
b/Gruntfile.js
index
0e1c8cb
..
dbbfcb8
100644
(file)
--- 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,
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' );
@@
-13,12
+14,19
@@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-stylelint' );
+ grunt.loadNpmTasks( 'grunt-webdriver' );
karmaProxy[ wgScriptPath ] = {
target: wgServer + wgScriptPath,
changeOrigin: true
};
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: [
grunt.initConfig( {
eslint: {
all: [
@@
-36,8
+44,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'
]
},
@@
-80,11
+86,14
@@
module.exports = function ( grunt ) {
} ],
logLevel: 'DEBUG',
frameworks: [ 'qunit' ],
} ],
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)
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' ]
@@
-105,7
+114,15
@@
module.exports = function ( grunt ) {
return require( 'path' ).join( dest, src.replace( 'resources/', '' ) );
}
}
return require( 'path' ).join( dest, src.replace( 'resources/', '' ) );
}
}
+ },
+
+ // Configure WebdriverIO task
+ webdriver: {
+ test: {
+ configFile: WebdriverIOconfigFile
+ }
}
}
+
} );
grunt.registerTask( 'assert-mw-env', function () {
} );
grunt.registerTask( 'assert-mw-env', function () {