From 728af5e55695ca432a14e3a26e4767a0325dc736 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Tue, 27 Oct 2015 12:24:32 -0700 Subject: [PATCH] Remove unused `queueableFn` arg from `onException` Fixes #958 --- lib/jasmine-core/jasmine.js | 6 +++--- src/core/QueueRunner.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index ded86ad1..d7ce7df9 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -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.. diff --git a/src/core/QueueRunner.js b/src/core/QueueRunner.js index e7086330..3196e15b 100644 --- a/src/core/QueueRunner.js +++ b/src/core/QueueRunner.js @@ -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..