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 "Have SvgHandler create a directory for its RSVG input files"
[lhc/web/wiklou.git]
/
tests
/
frontend
/
Gruntfile.js
diff --git
a/tests/frontend/Gruntfile.js
b/tests/frontend/Gruntfile.js
index
f18903b
..
59c18a8
100644
(file)
--- a/
tests/frontend/Gruntfile.js
+++ b/
tests/frontend/Gruntfile.js
@@
-5,9
+5,9
@@
/*jshint node:true */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
/*jshint node:true */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
- grunt.loadNpmTasks( 'grunt-jscs-checker' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.file.setBase( __dirname + '/../..' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.file.setBase( __dirname + '/../..' );
@@
-16,18
+16,21
@@
module.exports = function ( grunt ) {
pkg: grunt.file.readJSON( __dirname + '/package.json' ),
jshint: {
options: {
pkg: grunt.file.readJSON( __dirname + '/package.json' ),
jshint: {
options: {
- jshintrc:
'.jshintrc'
+ jshintrc:
true
},
},
- all: [ '*.js', '{includes,languages,resources,skins,tests}/**/*.js' ]
+ all: [
+ '*.js',
+ '{includes,languages,resources,skins,tests}/**/*.js'
+ ]
},
jscs: {
},
jscs: {
- // Known issues:
- // - https://github.com/mdevils/node-jscs/issues/277
- // - https://github.com/mdevils/node-jscs/issues/278
all: [
'<%= jshint.all %>',
// Auto-generated file with JSON (double quotes)
all: [
'<%= jshint.all %>',
// Auto-generated file with JSON (double quotes)
- '!tests/qunit/data/mediawiki.jqueryMsg.data.js'
+ '!tests/qunit/data/mediawiki.jqueryMsg.data.js',
+ // Skip functions are stored as script files but wrapped in a function when
+ // executed. node-jscs trips on the would-be "Illegal return statement".
+ '!resources/src/*-skip.js'
// Exclude all files ignored by jshint
].concat( grunt.file.read( '.jshintignore' ).split( '\n' ).reduce( function ( patterns, pattern ) {
// Exclude all files ignored by jshint
].concat( grunt.file.read( '.jshintignore' ).split( '\n' ).reduce( function ( patterns, pattern ) {
@@
-56,7
+59,7
@@
module.exports = function ( grunt ) {
'.jshintignore',
'.jshintrc'
],
'.jshintignore',
'.jshintrc'
],
- tasks:
['test']
+ tasks:
'test'
}
} );
}
} );