Enforce adherence to jshint via npm test

bryanburgers · Jan 14, 2014 · 80b8d74 · 80b8d74
1 parent 90280bd
commit 80b8d74
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,18 @@
+{
+	"node": true,
+	"curly": true,
+	"eqeqeq": true,
+	"immed": true,
+	"latedef": true,
+	"newcap": true,
+	"noarg": true,
+	"sub": true,
+	"undef": true,
+	"boss": true,
+	"eqnull": true,
+	"trailing": true,
+	"globals": {
+		"describe": false,
+		"it": false
+	}
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -7,19 +7,9 @@ module.exports = function(grunt) {
 	// Project configuration.
 	grunt.initConfig({
 		jshint: {
-			all: ['index.js', 'findPartials.js'],
+			all: ['index.js', 'findPartials.js', 'test/*.js'],
 			options: {
-				node: true,
-				curly: true,
-				eqeqeq: true,
-				immed: true,
-				latedef: true,
-				newcap: true,
-				noarg: true,
-				sub: true,
-				undef: true,
-				boss: true,
-				eqnull: true
+				jshintrc: ".jshintrc"
 			}
 		}
 	});

diff --git a/find-partials.js b/find-partials.js
@@ -5,15 +5,15 @@ function iteratePartials(parsed) {
 	var partialSet = {};
 
 	parsed.filter(function (i) {
-		return i[0] == ">";
+		return i[0] === ">";
 	}).map(function (i) {
 		return i[1];
 	}).forEach(function (i) {
 		partialSet[i] = true;
 	});
 
 	parsed.filter(function (i) {
-		return i[0] == "#";
+		return i[0] === "#";
 	}).map(function(i) {
 		iteratePartials(i[4]).map(function(i) {
 			partialSet[i] = true;

diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
   },
   "devDependencies": {
     "grunt": "~0.4",
-    "grunt-contrib-jshint": "~0.1.1",
+    "grunt-contrib-jshint": "~0.8",
+    "jshint": "~2.4",
     "mocha": "~1.7",
     "should": "~1.2"
   },
@@ -40,6 +41,6 @@
     "node": ">= 0.8.0"
   },
   "scripts": {
-    "test": "node node_modules/mocha/bin/mocha"
+    "test": "node node_modules/mocha/bin/mocha && node node_modules/jshint/bin/jshint"
   }
 }
diff --git a/test/find-partials.js b/test/find-partials.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var findPartials = require('../find-partials');
 var should = require('should');
 
@@ -17,7 +19,7 @@ describe('findPartials', function() {
 		var results = findPartials("{{> p1}} {{> p2}}");
 		sort(results).should.eql(["p1", "p2"]);
 	});
-	
+
 	it('should find partials inside a section', function() {
 		var results = findPartials("{{#test}}{{> p1}}{{/test}}");
 		sort(results).should.eql(["p1"]);

diff --git a/test/mustache-express.js b/test/mustache-express.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var fs = require('fs');
 var mustacheExpress = require('../mustache-express.js');
 var should = require('should');