X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=898b48f2dfca6210fa974d533c5ad4e64efd5337;hb=c8f77e97faaecfb656042554fdc4d60d32ad39e8;hp=811d2c06eb25edb5cf7de0e13fc18b44c0b661a4;hpb=2ffff73a46c29cdad1cbf59063f4dd75debd3b4c;p=lhc%2Fweb%2Fwiklou.git diff --git a/Gruntfile.js b/Gruntfile.js index 811d2c06eb..898b48f2df 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: [ @@ -44,8 +36,6 @@ module.exports = function ( grunt ) { '!extensions/**/*.js', '!skins/**/*.js', // Skip functions aren't even parseable - '!resources/src/dom-level2-skip.js', - '!resources/src/es5-skip.js', '!resources/src/mediawiki.hidpi-skip.js' ] }, @@ -64,9 +54,6 @@ module.exports = function ( grunt ) { installer: 'includes/installer/i18n/' }, stylelint: { - options: { - syntax: 'less' - }, src: '{resources/src,mw-config}/**/*.{css,less}' }, watch: { @@ -103,8 +90,8 @@ module.exports = function ( grunt ) { chromium: { browsers: [ 'Chromium' ] }, - more: { - browsers: [ 'Chrome', 'Firefox' ] + firefox: { + browsers: [ 'Firefox' ] } }, copy: { @@ -116,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 () {