warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unused queueableFn arg from onException

Browse Source 
Fixes #958
This commit is contained in:
Gregg Van Hove
2015-10-27 12:24:32 -07:00
parent 018fd53c10
commit 728af5e556
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jasmine-core/jasmine.js
View File

@@ -1902,7 +1902,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
if (queueableFn.timeout) {
timeoutId = Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [function() {
var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.');
onException(error, queueableFn);
onException(error);
next();
}, queueableFn.timeout()]]);
}
@@ -1915,12 +1915,12 @@ getJasmineRequireObj().QueueRunner = function(j$) {
}
}
function onException(e, queueableFn) {
function onException(e) {
self.onException(e);
}
function handleException(e, queueableFn) {
onException(e, queueableFn);
onException(e);
if (!self.catchException(e)) {
//TODO: set a var when we catch an exception and
//use a finally block to close the loop in a nice way..

6
src/core/QueueRunner.js
View File

@@ -73,7 +73,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
if (queueableFn.timeout) {
timeoutId = Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [function() {
var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.');
onException(error, queueableFn);
onException(error);
next();
}, queueableFn.timeout()]]);
}
@@ -86,12 +86,12 @@ getJasmineRequireObj().QueueRunner = function(j$) {
}
}
function onException(e, queueableFn) {
function onException(e) {
self.onException(e);
}
function handleException(e, queueableFn) {
onException(e, queueableFn);
onException(e);
if (!self.catchException(e)) {
//TODO: set a var when we catch an exception and
//use a finally block to close the loop in a nice way..