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
Don't require trailing slash in PSR-4 autoloader directory
[lhc/web/wiklou.git]
/
Gruntfile.js
diff --git
a/Gruntfile.js
b/Gruntfile.js
index
cb9a20d
..
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: [
@@
-116,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'
}
}
}
}