Add object diff

lib/reporters/base.js

@@ -5,7 +5,8 @@
 
 var tty = require('tty')
   , diff = require('diff')
-  , ms = require('../ms');
+  , ms = require('../ms')
+  , jsDump = require("jsDump");
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -144,7 +145,15 @@ exports.list = function(failures){
       , expected = err.expected;
 
     // actual / expected diff
-    if ('string' == typeof actual && 'string' == typeof expected) {
+    if (err.showDiff && undefined != actual && undefined != expected) {
+      jsDump.sortKeys = true
+
+      if ('string' != typeof actual)
+        err.actual = jsDump.parse(actual)
+
+      if ('string' != typeof expected)
+        err.expected = jsDump.parse(expected)
+
       var len = Math.max(actual.length, expected.length);
 
       if (len < 20) msg = errorDiff(err, 'Chars');
@@ -326,10 +335,26 @@ function pad(str, len) {
 
 function errorDiff(err, type) {
   return diff['diff' + type](err.actual, err.expected).map(function(str){
-    str.value = str.value
-      .replace(/\t/g, '<tab>')
-      .replace(/\r/g, '<CR>')
-      .replace(/\n/g, '<LF>\n');
+    if (str.added || str.removed) {
+      // replace all invisible chars if they are the only chars
+      if (/^[ \t\r\n]+$/.test(str))
+        str.value = str.value
+          .replace(/\t/g, '<tab>')
+          .replace(/\r/g, '<CR>')
+          .replace(/\n/g, '<LF>\n');
+      // otherwise only replace invisible chars at both ends
+      else
+        str.value = str.value
+          .replace(/^\t+|\t+$/, function(match) {
+            return match.replace(/\t/g, '<tab>');
+          })
+          .replace(/^\r+|\r+$/, function(match) {
+            return match.replace(/\r/g, '<CR>');
+          })
+          .replace(/^\n+|\n+$/, function(match) {
+            return match.replace(/\n/g, '<LF>\n');
+          });
+    }
     if (str.added) return colorLines('diff added', str.value);
     if (str.removed) return colorLines('diff removed', str.value);
     return str.value;

package.json

@@ -19,6 +19,7 @@
     , "debug": "*"
     , "mkdirp": "0.3.3"
     , "ms": "0.3.0"
+    , "jsDump": "1.x"
   }
   , "devDependencies": {
       "should": "*"