Don't setTimeout() every time the stack is cleared via MessageChannel()
This commit is contained in:
@@ -1645,6 +1645,7 @@ getJasmineRequireObj().clearStack = function(j$) {
|
|||||||
tail = tail.next = { task: fn };
|
tail = tail.next = { task: fn };
|
||||||
channel.port2.postMessage(0);
|
channel.port2.postMessage(0);
|
||||||
} else {
|
} else {
|
||||||
|
currentCallCount = 0;
|
||||||
setTimeout(fn);
|
setTimeout(fn);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -42,7 +42,11 @@ describe("ClearStack", function() {
|
|||||||
|
|
||||||
clearStack(function() { });
|
clearStack(function() { });
|
||||||
expect(setImmediate.calls.count()).toEqual(9);
|
expect(setImmediate.calls.count()).toEqual(9);
|
||||||
expect(setTimeout).toHaveBeenCalled();
|
expect(setTimeout.calls.count()).toEqual(1);
|
||||||
|
|
||||||
|
clearStack(function() { });
|
||||||
|
expect(setImmediate.calls.count()).toEqual(10);
|
||||||
|
expect(setTimeout.calls.count()).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("uses MessageChannels when available", function() {
|
it("uses MessageChannels when available", function() {
|
||||||
@@ -89,7 +93,11 @@ describe("ClearStack", function() {
|
|||||||
|
|
||||||
clearStack(function() { });
|
clearStack(function() { });
|
||||||
expect(fakeChannel.port2.postMessage.calls.count()).toEqual(9);
|
expect(fakeChannel.port2.postMessage.calls.count()).toEqual(9);
|
||||||
expect(setTimeout).toHaveBeenCalled();
|
expect(setTimeout.calls.count()).toEqual(1);
|
||||||
|
|
||||||
|
clearStack(function() { });
|
||||||
|
expect(fakeChannel.port2.postMessage.calls.count()).toEqual(10);
|
||||||
|
expect(setTimeout.calls.count()).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("calls setTimeout when onmessage is called recursively", function() {
|
it("calls setTimeout when onmessage is called recursively", function() {
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ getJasmineRequireObj().clearStack = function(j$) {
|
|||||||
tail = tail.next = { task: fn };
|
tail = tail.next = { task: fn };
|
||||||
channel.port2.postMessage(0);
|
channel.port2.postMessage(0);
|
||||||
} else {
|
} else {
|
||||||
|
currentCallCount = 0;
|
||||||
setTimeout(fn);
|
setTimeout(fn);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user