Merge branch 'promise-matching-1314' of https://github.com/sderickson/jasmine

2017-11-02 17:17:05 -07:00
parent 3aece2ac74 6ddf64568e
commit 285f06d5c4
4 changed files with 30 additions and 0 deletions
--- a/src/core/matchers/matchersUtil.js
+++ b/src/core/matchers/matchersUtil.js
@@ -213,6 +213,12 @@ getJasmineRequireObj().matchersUtil = function(j$) {
      diffBuilder.record(a, b);
      return false;
    }
+    
+    var aIsPromise = j$.isPromise(a);
+    var bIsPromise = j$.isPromise(b);
+    if (aIsPromise && bIsPromise) {
+      return a === b;
+    }

    // Assume equality for cyclic structures. The algorithm for detecting cyclic
    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.