diff options
| author | Ċ½eljko Filipin <zeljko.filipin@gmail.com> | 2018-04-07 15:56:56 +0200 |
|---|---|---|
| committer | Krinkle <krinklemail@gmail.com> | 2018-04-13 20:54:43 +0000 |
| commit | 4cbd36db87a4aa1888a63120ea41c678fb4be40c (patch) | |
| tree | 55be2fa477ae9ac371e7a8dec641ec4ab7119ca1 /Gruntfile.js | |
| parent | d972780d8bb5c1d04ad3f136d63108ae74d61b57 (diff) | |
| download | mediawikicore-4cbd36db87a4aa1888a63120ea41c678fb4be40c.tar.gz mediawikicore-4cbd36db87a4aa1888a63120ea41c678fb4be40c.zip | |
selenium: Remove Jenkins configuration file
Both Mocha and Cucumber tests should run. Since WebdriverIO supports only
running one test framework, the only way to do it is to have a generic
configuration file and two framework-specific files (Mocha, Cucumber). Having
Jenkins configuration file complicates things, and there is no need for
it.
Bug: T179190
Change-Id: I710066f7b5479dcad27aa57cd61007c1c2d88931
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index cb9a20d0a77d..69a123cc9f44 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: [ @@ -116,7 +109,7 @@ module.exports = function ( grunt ) { // Configure WebdriverIO task webdriver: { test: { - configFile: WebdriverIOconfigFile + configFile: './tests/selenium/wdio.conf.js' } } |