X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=2f5586862f102663df0e643428dc9cb8cf2e8303;hb=7e974c8c42b219b98850120e18f30121bd2de462;hp=cb9a20d0a77d4eb7140a294380578c9882902526;hpb=8624538de243da3779db5eb3362bedf78d2e2931;p=lhc%2Fweb%2Fwiklou.git diff --git a/Gruntfile.js b/Gruntfile.js index cb9a20d0a7..2f5586862f 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' ); @@ -14,19 +13,12 @@ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-karma' ); grunt.loadNpmTasks( 'grunt-stylelint' ); - grunt.loadNpmTasks( 'grunt-webdriver' ); 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: [ @@ -36,7 +28,7 @@ module.exports = function ( grunt ) { '!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/**', @@ -111,15 +103,7 @@ module.exports = function ( grunt ) { return require( 'path' ).join( dest, src.replace( 'resources/', '' ) ); } } - }, - - // Configure WebdriverIO task - webdriver: { - test: { - configFile: WebdriverIOconfigFile - } } - } ); grunt.registerTask( 'assert-mw-env', function () {