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
Fix improper parameters to ReflectionMethod::invoke
[lhc/web/wiklou.git]
/
Gruntfile.js
diff --git
a/Gruntfile.js
b/Gruntfile.js
index
cb9a20d
..
3687d28
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' );
@@
-14,19
+13,12
@@
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,7
+28,7
@@
module.exports = function ( grunt ) {
'!resources/lib/**',
'!resources/src/jquery.tipsy/**',
'!resources/src/jquery/jquery.farbtastic.js',
'!resources/lib/**',
'!resources/src/jquery.tipsy/**',
'!resources/src/jquery/jquery.farbtastic.js',
- '!resources/src/mediawiki.libs/**',
+ '!resources/src/mediawiki.libs
.jpegmeta
/**',
// Third-party code of PHPUnit coverage report
'!tests/coverage/**',
'!vendor/**',
// Third-party code of PHPUnit coverage report
'!tests/coverage/**',
'!vendor/**',
@@
-44,7
+36,7
@@
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/mediawiki.hidpi
-
skip.js'
+ '!resources/src/mediawiki.hidpi
/
skip.js'
]
},
jsonlint: {
]
},
jsonlint: {
@@
-111,15
+103,7
@@
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 () {