From 584dd753161fe5050d47d1ce1b62e9078573ff62 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 4 Jun 2014 05:02:55 +0200 Subject: [PATCH] Grunt: Clean up outdated information * Use jshintrc:true which lets grunt defer autodiscovery of the file to jshint instead of forcing it to '.jshintrc'. This also us to override certain settings from a subdirectory, to match behaviour of standalone jshint. * Remove comments about "Known issues" in node-jscs, those have been fixed a while back and were applied when we updated jscs in df8c455. * Match load order. * Use plain string instead of single-value array. Change-Id: I7fd8db63ba164de705239c4b419de446ca7d6809 --- tests/frontend/Gruntfile.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/frontend/Gruntfile.js b/tests/frontend/Gruntfile.js index f18903b80b..63c3d015ed 100644 --- a/tests/frontend/Gruntfile.js +++ b/tests/frontend/Gruntfile.js @@ -5,8 +5,8 @@ /*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-banana-checker' ); grunt.loadNpmTasks( 'grunt-jscs-checker' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); @@ -16,14 +16,14 @@ module.exports = function ( grunt ) { 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: { - // 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) @@ -56,7 +56,7 @@ module.exports = function ( grunt ) { '.jshintignore', '.jshintrc' ], - tasks: ['test'] + tasks: 'test' } } ); -- 2.20.1