Expand .with message to include actual results

chaijs · Apr 22, 2016 · 3293a5e · 3293a5e
1 parent eb493cf
commit 3293a5e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/chai-spies.js b/chai-spies.js
@@ -299,8 +299,10 @@
 
         this.assert(
             passed === calls.length
-          , 'expected ' + this._obj + ' to have been always called with #{exp} but got ' + passed + ' out of ' + calls.length
-          , 'expected ' + this._his + ' to have not always been called with #{exp}'
+          , 'expected ' + this._obj + ' to have been always called with ' + _.inspect(args, false, 2)
+            + ', but it was actually called ' + passed + ' times with those arguments out of ' + calls.length + ' total calls'
+          , 'expected ' + this._his + ' to have not always been called with ' + _.inspect(args, false, 2)
+            + ', but it was actually called ' + passed + ' times with those arguments out of ' + calls.length + ' total calls'
           , args
         );
       } else {
@@ -317,8 +319,15 @@
 
         this.assert(
             passed > 0
-          , 'expected ' + this._obj + ' to have been called with #{exp}'
-          , 'expected ' + this._his + ' to have not been called with #{exp} but got ' + passed + ' times'
+          , 'expected ' + this._obj + ' to have been called with ' + _.inspect(args, false, 2)
+            + (calls.length
+              ? ', but it was actually called ' + calls.length + ' times with:' + calls.map(function (call, i) {
+                return '\ncall #' + (i + 1) + ': ' + _.inspect(call, false, 2);
+              }).join('')
+              : ', but it was actually not called'
+            )
+          , 'expected ' + this._his + ' to have not been called with ' + _.inspect(args, false, 2)
+            + ', but it actually was called ' + passed + ' times with those arguments, out of ' + calls.length + ' total calls'
           , args
         );
       }

diff --git a/lib/spy.js b/lib/spy.js
@@ -283,8 +283,10 @@ module.exports = function (chai, _) {
 
       this.assert(
           passed === calls.length
-        , 'expected ' + this._obj + ' to have been always called with #{exp} but got ' + passed + ' out of ' + calls.length
-        , 'expected ' + this._his + ' to have not always been called with #{exp}'
+        , 'expected ' + this._obj + ' to have been always called with ' + _.inspect(args, false, 2)
+          + ', but it was actually called ' + passed + ' times with those arguments out of ' + calls.length + ' total calls'
+        , 'expected ' + this._his + ' to have not always been called with ' + _.inspect(args, false, 2)
+          + ', but it was actually called ' + passed + ' times with those arguments out of ' + calls.length + ' total calls'
         , args
       );
     } else {
@@ -301,8 +303,15 @@ module.exports = function (chai, _) {
 
       this.assert(
           passed > 0
-        , 'expected ' + this._obj + ' to have been called with #{exp}'
-        , 'expected ' + this._his + ' to have not been called with #{exp} but got ' + passed + ' times'
+        , 'expected ' + this._obj + ' to have been called with ' + _.inspect(args, false, 2) + ' at least once'
+          + (calls.length
+            ? ', but it was actually called ' + calls.length + ' times with:' + calls.map(function (call, i) {
+              return '\ncall #' + (i + 1) + ': ' + _.inspect(call, false, 2);
+            }).join('')
+            : ', but it was actually not called'
+          )
+        , 'expected ' + this._his + ' to have not been called with ' + _.inspect(args, false, 2)
+          + ', but it actually was called ' + passed + ' times with those arguments, out of ' + calls.length + ' total calls'
         , args
       );
     }