X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=Gruntfile.js;h=69a123cc9f443765702ab84676623a7b9b8ab6fa;hp=d1ef72f2701a22ce9ee6fa35eb4482ec61db45f1;hb=7668c368fda48d8a8c18ae8e223b12bafd0bd4c6;hpb=52e76843e268180a6f7add00f1105c42bf6a4ee8 diff --git a/Gruntfile.js b/Gruntfile.js index d1ef72f270..69a123cc9f 100644 --- 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, - WebdriverIOconfigFile, karmaProxy = {}; grunt.loadNpmTasks( 'grunt-banana-checker' ); @@ -21,12 +20,6 @@ module.exports = function ( grunt ) { 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: [ @@ -98,8 +91,8 @@ module.exports = function ( grunt ) { chromium: { browsers: [ 'Chromium' ] }, - more: { - browsers: [ 'Chrome', 'Firefox' ] + firefox: { + browsers: [ 'Firefox' ] } }, copy: { @@ -116,7 +109,7 @@ module.exports = function ( grunt ) { // Configure WebdriverIO task webdriver: { test: { - configFile: WebdriverIOconfigFile + configFile: './tests/selenium/wdio.conf.js' } }