Allow jasmine-npm to handle its own load errors

[Fixes #153466462]
This commit is contained in:
Steve Gravrock
2017-12-08 08:16:59 -08:00
parent d16aa550cb
commit eb93d38294
3 changed files with 33 additions and 26 deletions

View File

@@ -28,7 +28,7 @@ getJasmineRequireObj().Env = function(j$) {
var throwOnExpectationFailure = false;
var random = true;
var seed = null;
var suppressLoadErrors = false;
var handlingLoadErrors = true;
var hasFailures = false;
var currentSuite = function() {
@@ -95,15 +95,13 @@ getJasmineRequireObj().Env = function(j$) {
var globalErrors = new j$.GlobalErrors();
globalErrors.install();
globalErrors.pushListener(function(message, filename, lineno) {
if (!suppressLoadErrors) {
topSuite.result.failedExpectations.push({
passed: false,
globalErrorType: 'load',
message: message,
filename: filename,
lineno: lineno
});
}
topSuite.result.failedExpectations.push({
passed: false,
globalErrorType: 'load',
message: message,
filename: filename,
lineno: lineno
});
});
this.specFilter = function() {
@@ -249,7 +247,10 @@ getJasmineRequireObj().Env = function(j$) {
};
this.suppressLoadErrors = function() {
suppressLoadErrors = true;
if (handlingLoadErrors) {
globalErrors.popListener();
}
handlingLoadErrors = false;
};
var queueRunnerFactory = function(options) {
@@ -278,7 +279,7 @@ getJasmineRequireObj().Env = function(j$) {
};
this.execute = function(runnablesToRun) {
globalErrors.popListener();
this.suppressLoadErrors();
if(!runnablesToRun) {
if (focusedRunnables.length) {