diff --git a/test/integration/jasmine-boot.js b/test/integration/jasmine-boot.js index 8379cea4a..12891b8ba 100644 --- a/test/integration/jasmine-boot.js +++ b/test/integration/jasmine-boot.js @@ -52,25 +52,29 @@ async function runTests(results) { jasmineDone(suiteInfo) {}, jasmineStarted(suiteInfo) {}, specDone(result) { - // Report on the result of individual tests. - if (result.status === "excluded") { + // Ignore excluded (fit/xit) or skipped (pending) tests. + if (["excluded", "pending"].includes(result.status)) { return; } + + // Report on passed or failed tests. ++results.runs; - if (result.failedExpectations.length > 0) { + if (result.status === "passed") { + console.log(`TEST-PASSED | ${result.description}`); + } else { ++results.failures; console.log(`TEST-UNEXPECTED-FAIL | ${result.description}`); - } else { - console.log(`TEST-PASSED | ${result.description}`); } }, specStarted(result) {}, suiteDone(result) { - if (result.status === "excluded") { + // Ignore excluded (fdescribe/xdescribe) or skipped (pending) suites. + if (["excluded", "pending"].includes(result.status)) { return; } - // Report on the result of `afterAll` invocations. - if (result.failedExpectations.length > 0) { + + // Report on failed suites only (indicates problems in setup/teardown). + if (result.status === "failed") { ++results.failures; console.log(`TEST-UNEXPECTED-FAIL | ${result.description}`); } diff --git a/test/reporter.js b/test/reporter.js index d3475035b..25d9b6ab8 100644 --- a/test/reporter.js +++ b/test/reporter.js @@ -62,11 +62,13 @@ const TestReporter = function (browser) { this.specStarted = function (result) {}; this.specDone = function (result) { - if (result.status === "excluded") { + // Ignore excluded (fit/xit) or skipped (pending) tests. + if (["excluded", "pending"].includes(result.status)) { return; } - // Report on the result of individual tests. - if (result.failedExpectations.length === 0) { + + // Report on passed or failed tests. + if (result.status === "passed") { sendResult("TEST-PASSED", result.description); } else { let failedMessages = ""; @@ -78,11 +80,13 @@ const TestReporter = function (browser) { }; this.suiteDone = function (result) { - if (result.status === "excluded") { + // Ignore excluded (fdescribe/xdescribe) or skipped (pending) suites. + if (["excluded", "pending"].includes(result.status)) { return; } - // Report on the result of `afterAll` invocations. - if (result.failedExpectations.length > 0) { + + // Report on failed suites only (indicates problems in setup/teardown). + if (result.status === "failed") { let failedMessages = ""; for (const item of result.failedExpectations) { failedMessages += `${item.message} `;