Merge pull request #60 from broofa/master

Patch for Issue #59

Author: mreinstein

lib/assert.js

@@ -172,11 +172,16 @@ if (typeof require !== 'undefined' && typeof process !== 'undefined') {
 
 function _deepEqual(actual, expected) {
   // 7.1. All identical values are equivalent, as determined by ===.
-  if (actual === expected) {
+  if (actual === expected)
     return true;
+
+  // Convert to primitives, if supported
+  actual = actual.valueOf ? actual.valueOf() : actual;
+  expected = expected.valueOf ? expected.valueOf() : expected;
+
   // 7.2. If the expected value is a Date object, the actual value is
   // equivalent if it is also a Date object that refers to the same time.
-  } else if (actual instanceof Date && expected instanceof Date) {
+  if (actual instanceof Date && expected instanceof Date) {
     return actual.getTime() === expected.getTime();
 
   // 7.2.1 If the expcted value is a RegExp object, the actual value is
@@ -225,6 +230,7 @@ function isArguments (object) {
 function objEquiv (a, b) {
   if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
     return false;
+
   // an identical "prototype" property.
   if (a.prototype !== b.prototype) return false;
   //~~~I've managed to break Object.keys through screwy arguments passing.

test/test-base.js

@@ -115,7 +115,8 @@ exports.testSame = makeTest('same',
 exports.testEqual = makeTest('equal', [1, 1], [1, 2]);
 exports.testNotEqual = makeTest('notEqual', [1, 2], [1, 1]);
 exports.testDeepEqual = makeTest('deepEqual',
-    [{one: 1}, {one: 1}], [{one: 1}, {two: 2}]
+  [{one: 1, two: 2}, {one: 1, two: {valueOf:function() {return 2;}}}],
+  [{one: 1, two: 2}, {two: 2}]
 );
 exports.testNotDeepEqual = makeTest('notDeepEqual',
     [{one: 1}, {two: 2}], [{one: 1}, {one: 1}]