@@ -166,6 +166,16 @@ describe("matchersUtil", function() {
|
|||||||
|
|
||||||
expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(true);
|
expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("passes for equivalent Promises (GitHub issue #1314)", function() {
|
||||||
|
if (typeof Promise === 'undefined') { return; }
|
||||||
|
|
||||||
|
var p1 = new Promise(function () {}),
|
||||||
|
p2 = new Promise(function () {});
|
||||||
|
|
||||||
|
expect(jasmineUnderTest.matchersUtil.equals(p1, p1)).toBe(true);
|
||||||
|
expect(jasmineUnderTest.matchersUtil.equals(p1, p2)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
describe("when running in a browser", function() {
|
describe("when running in a browser", function() {
|
||||||
function isNotRunningInBrowser() {
|
function isNotRunningInBrowser() {
|
||||||
|
|||||||
@@ -75,6 +75,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
|
|||||||
return obj.nodeType > 0;
|
return obj.nodeType > 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
j$.isPromise = function(obj) {
|
||||||
|
return (typeof Promise !== 'undefined') && obj.constructor === Promise;
|
||||||
|
};
|
||||||
|
|
||||||
j$.fnNameFor = function(func) {
|
j$.fnNameFor = function(func) {
|
||||||
if (func.name) {
|
if (func.name) {
|
||||||
return func.name;
|
return func.name;
|
||||||
|
|||||||
@@ -209,6 +209,12 @@ getJasmineRequireObj().matchersUtil = function(j$) {
|
|||||||
diffBuilder.record(a, b);
|
diffBuilder.record(a, b);
|
||||||
return false;
|
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
|
// Assume equality for cyclic structures. The algorithm for detecting cyclic
|
||||||
// structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
|
// structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
|
||||||
|
|||||||
Reference in New Issue
Block a user