squash me

nodejs · Apr 28, 2016 · 26eb196 · 26eb196
1 parent 6d13a40
commit 26eb196
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/assert.js b/lib/assert.js
@@ -193,8 +193,9 @@ function _deepEqual(actual, expected, strict, memos) {
   } else {
     memos = memos || {actual: [], expected: []};
 
-    if (memos.actual.includes(actual)) {
-      if (memos.actual.indexOf(actual) === memos.expected.indexOf(expected)) {
+    const actualIndex = memos.actual.indexOf(actual);
+    if (actualIndex !== -1) {
+      if (actualIndex === memos.expected.indexOf(expected)) {
         return true;
       }
     }

diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -401,8 +401,8 @@ assert.ok(threw);
   e.a = 1;
   e.b = e.a;
 
-  a.throws(makeBlock(a.deepEqual, d, e));
-  a.throws(makeBlock(a.deepStrictEqual, d, e));
+  a.throws(makeBlock(a.deepEqual, d, e), /AssertionError/);
+  a.throws(makeBlock(a.deepStrictEqual, d, e), /AssertionError/);
 }
 // GH-7178. Ensure reflexivity of deepEqual with `arguments` objects.
 var args = (function() { return arguments; })();