Update jasmine node reporter to clean up log spew in Node >= 0.12

linkedin · Mar 24, 2015 · 0ac0c53 · 0ac0c53
1 parent c02b88d
commit 0ac0c53
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 33 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -172,8 +172,18 @@ module.exports = function(grunt) {
         }
       }
     },
-    jasmine_node: {
-      dustc: ['test/jasmine-test/spec/cli/']
+    jasmine_nodejs: {
+      dustc: {
+        specs: ['test/jasmine-test/spec/cli/*'],
+        options: {
+          reporters: {
+            console: {
+              colors: false,
+              verbose: false
+            }
+          }
+        }
+      }
     },
     watch: {
       lib: {
@@ -247,7 +257,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-gh-pages');
   grunt.loadNpmTasks('grunt-bump');
   grunt.loadNpmTasks('grunt-shell');
-  grunt.loadNpmTasks('grunt-jasmine-node');
+  grunt.loadNpmTasks('grunt-jasmine-nodejs');
 
   //--------------------------------------------------
   //------------Grunt task aliases -------------------
@@ -259,8 +269,8 @@ module.exports = function(grunt) {
   grunt.registerTask('testNode',       ['shell:oldTests']);
   grunt.registerTask('testRhino',      ['build', 'shell:testRhino']);
   grunt.registerTask('testPhantom',    ['build', 'jasmine:testProd']);
-  grunt.registerTask('testCli',        ['build', 'jasmine_node:dustc']);
-  grunt.registerTask('test',           ['build', 'jasmine:testProd', 'jasmine_node:dustc', 'shell:oldTests', 'shell:testRhino', 'jasmine:coverage']);
+  grunt.registerTask('testCli',        ['build', 'jasmine_nodejs:dustc']);
+  grunt.registerTask('test',           ['build', 'jasmine:testProd', 'jasmine_nodejs:dustc', 'shell:oldTests', 'shell:testRhino', 'jasmine:coverage']);
 
   //task for debugging in browser
   grunt.registerTask('dev',            ['build', 'jasmine:testDev:build', 'connect:testServer','log:testClient', 'watch:lib']);

diff --git a/lib/dust.js b/lib/dust.js
@@ -674,6 +674,7 @@
       if (body) {
         return body(this, context);
       }
+      dust.log('No block for exists check in template `' + context.getTemplateName() + '`', DEBUG);
     } else if (skip) {
       return skip(this, context);
     }
@@ -688,6 +689,7 @@
       if (body) {
         return body(this, context);
       }
+      dust.log('No block for not-exists check in template `' + context.getTemplateName() + '`', DEBUG);
     } else if (skip) {
       return skip(this, context);
     }
@@ -743,9 +745,9 @@
     if(dust.helpers[name]) {
       try {
         return dust.helpers[name](chunk, context, bodies, params);
-      } catch(e) {
-        dust.log('Error in helper `' + name + '`: ' + e.message, ERROR);
-        return chunk.setError(e);
+      } catch(err) {
+        dust.log('Error in helper `' + name + '`: ' + err.message, ERROR);
+        return chunk.setError(err);
       }
     } else {
       dust.log('Helper `' + name + '` does not exist', WARN);

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "grunt-contrib-uglify": "~0.2.7",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-gh-pages": "~0.9.0",
-    "grunt-jasmine-node": "~0.2.1",
+    "grunt-jasmine-nodejs": "~1.0.2",
     "grunt-shell": "~0.6.1",
     "grunt-template-jasmine-istanbul": "~0.2.5",
     "pegjs": "0.8.0"

diff --git a/test/jasmine-test/spec/cli/lib/matchers.js b/test/jasmine-test/spec/cli/lib/matchers.js
@@ -3,34 +3,44 @@ var fs = require('fs'),
 
 var matchers = {};
 
-matchers.toHaveTemplate = function(expected) {
-  var dustTemplateRegex = /dust\.register\("([A-z0-9\-_\/\\]+)",body_0\)/g,
-      matches = [];
-
-  this.actual.replace(dustTemplateRegex, function(whole, match) {
-    matches.push(match);
-  });
-
-  return matches.indexOf(dust.escapeJs(expected)) > -1;
+matchers.toHaveTemplate = function(util) {
+  var dustTemplateRegex = /dust\.register\("([A-z0-9\-_\/\\]+)",body_0\)/g;
+
+  return {
+    compare: function(actual, expected) {
+      var matches = [];
+      actual.replace(dustTemplateRegex, function(whole, match) {
+        matches.push(match);
+      });
+      return { pass: matches.indexOf(dust.escapeJs(expected)) > -1 };
+    }
+  };
 };
 
-matchers.toHaveAMDTemplate = function(expected) {
-  var dustAMDTemplateRegex = /define\("([A-z0-9\-_\/\\]+)",\["dust\.core"\]/g,
-      matches = [];
-
-  this.actual.replace(dustAMDTemplateRegex, function(whole, match) {
-    matches.push(match);
-  });
-
-  return matches.indexOf(dust.escapeJs(expected)) > -1 &&
-         matchers.toHaveTemplate.call(this, expected);
+matchers.toHaveAMDTemplate = function(util) {
+  var dustAMDTemplateRegex = /define\("([A-z0-9\-_\/\\]+)",\["dust\.core"\]/g;
+
+  return {
+    compare: function(actual, expected) {
+      var matches = [];
+      actual.replace(dustAMDTemplateRegex, function(whole, match) {
+        matches.push(match);
+      });
+      return { pass: matches.indexOf(dust.escapeJs(expected)) > -1 &&
+                     matchers.toHaveTemplate().compare.call(this, actual, expected) };
+    }
+  };
 };
 
-matchers.toBeFileWithTemplate = function(expected) {
-  this.actual = fs.readFileSync(this.actual, "utf8");
-  return matchers.toHaveTemplate.call(this, expected);
+matchers.toBeFileWithTemplate = function(util) {
+  return {
+    compare: function(actual, expected) {
+      actual = fs.readFileSync(actual, "utf8");
+      return { pass: matchers.toHaveTemplate().compare.call(this, actual, expected) };
+    }
+  };
 };
 
 beforeEach(function() {
-  this.addMatchers(matchers);
+  jasmine.addMatchers(matchers);
 });
diff --git a/test/jasmine-test/spec/coreTests.js b/test/jasmine-test/spec/coreTests.js
@@ -1987,7 +1987,21 @@ var coreTests = [
         log: "Section without corresponding key in template `Section not found`",
         message: "test the log messages for an unhandled section."
       },
-      {
+	  {
+		name: "Exists without body",
+		source: "{?foo/}",
+		context: {"foo": "foo"},
+		log: "No block for exists check in template `Exists without body`",
+		message: "test the log message for an exists block with no body"
+	  },
+	  {
+		name: "Not exists without body",
+		source: "{^foo/}",
+		context: {},
+		log: "No block for not-exists check in template `Not exists without body`",
+		message: "test the log message for a not-exists block with no body"
+	  },
+	  {
         name: "Errors should be throwable from helpers and consumed in the render callback/stream onerror",
         source: "{@error errorMessage=\"helper error\"}{/error}",
         context: { },