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

Improved reporting of load errors and afterAll errors

Browse Source 
- Pass file and line number to reporters when present
- Show file and line number in the HTML reporter when present
- Visually separate adjacent errors in the HTML reporter

[#24901981]
This commit is contained in:
Steve Gravrock
2017-11-04 10:28:42 -07:00
parent ae9b95269c
commit 82eeed3c85
8 changed files with 79 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/jasmine-core/jasmine-html.js
View File

@@ -252,9 +252,21 @@ jasmineRequire.HtmlReporter = function(j$) {
}
for(i = 0; i < globalFailures.length; i++) {
var failure = globalFailures[i];
var prefix = failure.globalErrorType === 'load' ? 'Error during loading: ' : afterAllMessagePrefix;
alert.appendChild(createDom('span', {className: errorBarClassName}, prefix + failure.message));
alert.appendChild(createDom('span', {className: errorBarClassName}, globalFailureMessage(globalFailures[i])));
}
function globalFailureMessage(failure) {
if (failure.globalErrorType === 'load') {
var prefix = 'Error during loading: ' + failure.message;
if (failure.filename) {
return prefix + ' in ' + failure.filename + ' line ' + failure.lineno;
} else {
return prefix;
}
} else {
return afterAllMessagePrefix + failure.message;
}
}
var results = find('.jasmine-results');

3
lib/jasmine-core/jasmine.css
View File

@@ -29,10 +29,9 @@ body { overflow-y: scroll; }
.jasmine_html-reporter .jasmine-run-options .jasmine-payload { position: absolute; display: none; right: -1px; border: 1px solid #8a4182; background-color: #eee; white-space: nowrap; padding: 4px 8px; }
.jasmine_html-reporter .jasmine-run-options .jasmine-payload.jasmine-open { display: block; }
.jasmine_html-reporter .jasmine-bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
.jasmine_html-reporter .jasmine-bar.jasmine-failed { background-color: #ca3a11; }
.jasmine_html-reporter .jasmine-bar.jasmine-failed, .jasmine_html-reporter .jasmine-bar.jasmine-errored { background-color: #ca3a11; border-bottom: 1px solid #eee; }
.jasmine_html-reporter .jasmine-bar.jasmine-passed { background-color: #007069; }
.jasmine_html-reporter .jasmine-bar.jasmine-skipped { background-color: #bababa; }
.jasmine_html-reporter .jasmine-bar.jasmine-errored { background-color: #ca3a11; }
.jasmine_html-reporter .jasmine-bar.jasmine-menu { background-color: #fff; color: #aaa; }
.jasmine_html-reporter .jasmine-bar.jasmine-menu a { color: #333; }
.jasmine_html-reporter .jasmine-bar a { color: white; }

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

@@ -774,12 +774,14 @@ getJasmineRequireObj().Env = function(j$) {
var globalErrors = new j$.GlobalErrors();
globalErrors.install();
globalErrors.pushListener(function(message) {
globalErrors.pushListener(function(message, filename, lineno) {
if (!suppressLoadErrors) {
topSuite.result.failedExpectations.push({
passed: false,
globalErrorType: 'load',
message: message
message: message,
filename: filename,
lineno: lineno
});
}
});

10
spec/core/integration/EnvSpec.js
View File

@@ -2033,12 +2033,16 @@ describe("Env integration", function() {
{
passed: false,
globalErrorType: 'load',
message: 'Uncaught SyntaxError: Unexpected end of input'
message: 'Uncaught SyntaxError: Unexpected end of input',
filename: 'borkenSpec.js',
lineno: 42
},
{
passed: false,
globalErrorType: 'load',
message: 'Uncaught Error: ENOCHEESE'
message: 'Uncaught Error: ENOCHEESE',
filename: undefined,
lineno: undefined
}
]);
@@ -2046,7 +2050,7 @@ describe("Env integration", function() {
});
env.addReporter(reporter);
global.onerror('Uncaught SyntaxError: Unexpected end of input');
global.onerror('Uncaught SyntaxError: Unexpected end of input', 'borkenSpec.js', 42);
global.onerror('Uncaught Error: ENOCHEESE');
env.execute();

36
spec/html/HtmlReporterSpec.js
View File

@@ -197,21 +197,47 @@ describe("HtmlReporter", function() {
reporter.suiteDone({ status: 'failed', failedExpectations: [{ message: 'My Other Exception' }] });
reporter.jasmineDone({ failedExpectations: [
{ message: 'Global After All Failure', globalErrorType: 'afterAll' },
{ message: 'Other Global' },
{ message: 'Your JS is borken', globalErrorType: 'load' }
] });
var alertBars = container.querySelectorAll(".jasmine-alert .jasmine-bar");
expect(alertBars.length).toEqual(6);
expect(alertBars.length).toEqual(5);
expect(alertBars[1].innerHTML).toMatch(/My After All Exception/);
expect(alertBars[1].getAttribute("class")).toEqual('jasmine-bar jasmine-errored');
expect(alertBars[2].innerHTML).toMatch(/My Other Exception/);
expect(alertBars[3].innerHTML).toMatch(/AfterAll Global After All Failure/);
// TODO: What about this?
expect(alertBars[4].innerHTML).toMatch(/Other Global/);
expect(alertBars[4].innerHTML).toMatch(/Error during loading: Your JS is borken/);
expect(alertBars[4].innerHTML).not.toMatch(/line/);
});
expect(alertBars[5].innerHTML).toMatch(/Error during loading: Your JS is borken/);
it("displays file and line information if available", function() {
var env = new jasmineUnderTest.Env(),
container = document.createElement("div"),
getContainer = function() { return container; },
reporter = new jasmineUnderTest.HtmlReporter({
env: env,
getContainer: getContainer,
createElement: function() { return document.createElement.apply(document, arguments); },
createTextNode: function() { return document.createTextNode.apply(document, arguments); }
});
reporter.initialize();
reporter.jasmineStarted({});
reporter.jasmineDone({ failedExpectations: [
{
message: 'Your JS is borken',
globalErrorType: 'load',
filename: 'some/file.js',
lineno: 42
}
] });
var alertBars = container.querySelectorAll(".jasmine-alert .jasmine-bar");
expect(alertBars.length).toEqual(2);
expect(alertBars[1].innerHTML).toMatch(/Error during loading: Your JS is borken in some\/file.js line 42/);
});
});

6
src/core/Env.js
View File

@@ -93,12 +93,14 @@ getJasmineRequireObj().Env = function(j$) {
var globalErrors = new j$.GlobalErrors();
globalErrors.install();
globalErrors.pushListener(function(message) {
globalErrors.pushListener(function(message, filename, lineno) {
if (!suppressLoadErrors) {
topSuite.result.failedExpectations.push({
passed: false,
globalErrorType: 'load',
message: message
message: message,
filename: filename,
lineno: lineno
});
}
});

18
src/html/HtmlReporter.js
View File

@@ -223,9 +223,21 @@ jasmineRequire.HtmlReporter = function(j$) {
}
for(i = 0; i < globalFailures.length; i++) {
var failure = globalFailures[i];
var prefix = failure.globalErrorType === 'load' ? 'Error during loading: ' : afterAllMessagePrefix;
alert.appendChild(createDom('span', {className: errorBarClassName}, prefix + failure.message));
alert.appendChild(createDom('span', {className: errorBarClassName}, globalFailureMessage(globalFailures[i])));
}
function globalFailureMessage(failure) {
if (failure.globalErrorType === 'load') {
var prefix = 'Error during loading: ' + failure.message;
if (failure.filename) {
return prefix + ' in ' + failure.filename + ' line ' + failure.lineno;
} else {
return prefix;
}
} else {
return afterAllMessagePrefix + failure.message;
}
}
var results = find('.jasmine-results');

7
src/html/_HTMLReporter.scss
View File

@@ -200,8 +200,9 @@ body {
display: block;
color: #eee;
&.jasmine-failed {
&.jasmine-failed, &.jasmine-errored {
background-color: $failing-color;
border-bottom: 1px solid $page-background-color;
}
&.jasmine-passed {
@@ -212,10 +213,6 @@ body {
background-color: $neutral-color;
}
&.jasmine-errored {
background-color: $failing-color;
}
&.jasmine-menu {
background-color: #fff;
color: $faint-text-color;