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
Merge "CRH Transliteration Pattern Matching Fixes"
[lhc/web/wiklou.git]
/
Gruntfile.js
diff --git
a/Gruntfile.js
b/Gruntfile.js
index
811d2c0
..
898b48f
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' );
@@
-14,19
+13,12
@@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-stylelint' );
- grunt.loadNpmTasks( 'grunt-webdriver' );
karmaProxy[ wgScriptPath ] = {
target: wgServer + wgScriptPath,
changeOrigin: true
};
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: [
grunt.initConfig( {
eslint: {
all: [
@@
-44,8
+36,6
@@
module.exports = function ( grunt ) {
'!extensions/**/*.js',
'!skins/**/*.js',
// Skip functions aren't even parseable
'!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'
]
},
'!resources/src/mediawiki.hidpi-skip.js'
]
},
@@
-64,9
+54,6
@@
module.exports = function ( grunt ) {
installer: 'includes/installer/i18n/'
},
stylelint: {
installer: 'includes/installer/i18n/'
},
stylelint: {
- options: {
- syntax: 'less'
- },
src: '{resources/src,mw-config}/**/*.{css,less}'
},
watch: {
src: '{resources/src,mw-config}/**/*.{css,less}'
},
watch: {
@@
-103,8
+90,8
@@
module.exports = function ( grunt ) {
chromium: {
browsers: [ 'Chromium' ]
},
chromium: {
browsers: [ 'Chromium' ]
},
-
more
: {
- browsers: [ '
Chrome', '
Firefox' ]
+
firefox
: {
+ browsers: [ 'Firefox' ]
}
},
copy: {
}
},
copy: {
@@
-116,15
+103,7
@@
module.exports = function ( grunt ) {
return require( 'path' ).join( dest, src.replace( 'resources/', '' ) );
}
}
return require( 'path' ).join( dest, src.replace( 'resources/', '' ) );
}
}
- },
-
- // Configure WebdriverIO task
- webdriver: {
- test: {
- configFile: WebdriverIOconfigFile
- }
}
}
-
} );
grunt.registerTask( 'assert-mw-env', function () {
} );
grunt.registerTask( 'assert-mw-env', function () {