From 775e2ff0a9c8336e015e13fa7fd15693abf9d560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Daoust?= Date: Thu, 7 Nov 2013 14:38:30 +0100 Subject: [PATCH] Clears timeout timer even when async spec throws an exception When an async spec throws a (sync) exception for some reason, the exception was correctly caught and reported by Jasmine but the timeout timer continued to run in the background. For instance, running the (rather stupid) example below would report the exception immediately but would also make the process loop for 5s (and report the exception depending on the reported being used). describe('exception', function () { it('is caught but timer continues to run', function (done) { throw new Error('Oh no!'); }); }); This happened because the timout timer is set in Spec while the "try... catch" block is in the queue runner. The "callDone" function of "timeoutable" that resets the timer was thus not called. The commit simply introduces a "try... catch" block within the `timeoutable` function to ensure that "callDone" gets called even when an exception is thrown. --- src/core/Spec.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/Spec.js b/src/core/Spec.js index 65ba928b..8c51b946 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -62,7 +62,13 @@ getJasmineRequireObj().Spec = function(j$) { done(); }; - fn.call(this, callDone); //TODO: do we care about more than 1 arg? + try { + fn.call(this, callDone); //TODO: do we care about more than 1 arg? + } + catch (e) { + onException(e); + callDone(); + } }; }