After all exceptions dispatch to reporter hook

- Add 'afterAllException' hook to reporter dispatch, we might want to make this more generic in the future
- Add afterAllException function to HtmlReporter

[#66789174]
This commit is contained in:
Christopher Amavisca and Greg Cobb
2014-03-06 12:01:37 -08:00
parent a3c3505086
commit 97ae9a2d88
7 changed files with 108 additions and 7 deletions

View File

@@ -34,7 +34,8 @@ getJasmineRequireObj().Env = function(j$) {
'suiteStarted',
'suiteDone',
'specStarted',
'specDone'
'specDone',
'afterAllException'
]);
this.specFilter = function() {
@@ -165,6 +166,7 @@ getJasmineRequireObj().Env = function(j$) {
var queueRunnerFactory = function(options) {
options.catchException = catchException;
options.reporter = reporter;
options.clearStack = options.clearStack || clearStack;
options.timer = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
@@ -347,7 +349,7 @@ getJasmineRequireObj().Env = function(j$) {
};
this.afterAll = function(afterAllFunction) {
currentDeclarationSuite.afterAll({ fn: afterAllFunction, timeout: function() { return j$.DEFAULT_TIMEOUT_INTERVAL; } });
currentDeclarationSuite.afterAll({ fn: afterAllFunction, isAfterAll: true, timeout: function() { return j$.DEFAULT_TIMEOUT_INTERVAL; } });
};
this.pending = function() {

View File

@@ -18,6 +18,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
this.catchException = attrs.catchException || function() { return true; };
this.userContext = attrs.userContext || {};
this.timer = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
this.reporter = attrs.reporter;
}
QueueRunner.prototype.execute = function() {
@@ -25,7 +26,8 @@ getJasmineRequireObj().QueueRunner = function(j$) {
};
QueueRunner.prototype.run = function(queueableFns, recursiveIndex) {
var length = queueableFns.length,
var runner = this,
length = queueableFns.length,
self = this,
iterativeIndex;
@@ -48,6 +50,9 @@ getJasmineRequireObj().QueueRunner = function(j$) {
try {
queueableFn.fn.call(self.userContext);
} catch (e) {
if(queueableFn.isAfterAll){
runner.reporter.afterAllException(e);
}
handleException(e);
}
}
@@ -72,6 +77,9 @@ getJasmineRequireObj().QueueRunner = function(j$) {
try {
queueableFn.fn.call(self.userContext, next);
} catch (e) {
if(queueableFn.isAfterAll) {
runner.reporter.afterAllException(e);
}
handleException(e);
next();
}

View File

@@ -64,6 +64,10 @@ jasmineRequire.HtmlReporter = function(j$) {
currentParent.addChild(result, 'spec');
};
this.afterAllException = function(error) {
console.error(error);
};
var failures = [];
this.specDone = function(result) {
if (result.status != 'disabled') {