Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/command/run-workers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const stats = {
passes: 0,
failures: 0,
tests: 0,
pending: 0,
};


Expand Down Expand Up @@ -108,6 +109,10 @@ module.exports = function (workers, options) {
output.test.passed(repackTest(message.data));
updateFinishedTests(repackTest(message.data), maxReruns);
break;
case event.test.skipped:
output.test.skipped(repackTest(message.data));
updateFinishedTests(repackTest(message.data), maxReruns);
break;
case event.suite.before: output.suite.started(message.data); break;
case event.all.after: appendStats(message.data); break;
}
Expand Down Expand Up @@ -137,7 +142,7 @@ function printResults() {
stats.duration = stats.end - stats.start;
output.print();
if (stats.tests === 0 || (stats.passes && !errors.length)) {
output.result(stats.passes, stats.failures, 0, `${stats.duration / 1000}s`);
output.result(stats.passes, stats.failures, stats.pending, `${stats.duration / 1000}s`);
}
if (stats.failures) {
output.print();
Expand Down Expand Up @@ -206,6 +211,7 @@ function appendStats(newStats) {
stats.passes += newStats.passes;
stats.failures += newStats.failures;
stats.tests += newStats.tests;
stats.pending += newStats.pending;
}

function repackTest(test) {
Expand Down
5 changes: 5 additions & 0 deletions lib/command/workers/runTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ function initializeListeners() {
event.dispatcher.on(event.test.failed, test => sendToParentThread({ event: event.test.failed, workerIndex, data: simplifyTest(test) }));
event.dispatcher.on(event.test.passed, test => sendToParentThread({ event: event.test.passed, workerIndex, data: simplifyTest(test) }));
event.dispatcher.on(event.test.started, test => sendToParentThread({ event: event.test.started, workerIndex, data: simplifyTest(test) }));
event.dispatcher.on(event.test.skipped, test => sendToParentThread({ event: event.test.skipped, workerIndex, data: simplifyTest(test) }));

event.dispatcher.on(event.hook.failed, (test, err) => sendToParentThread({ event: event.hook.failed, workerIndex, data: simplifyTest(test, err) }));
event.dispatcher.on(event.hook.passed, (test, err) => sendToParentThread({ event: event.hook.passed, workerIndex, data: simplifyTest(test, err) }));
Expand All @@ -122,13 +123,17 @@ function collectStats() {
passes: 0,
failures: 0,
tests: 0,
pending: 0,
};
event.dispatcher.on(event.test.passed, () => {
stats.passes++;
});
event.dispatcher.on(event.test.failed, () => {
stats.failures++;
});
event.dispatcher.on(event.test.skipped, () => {
stats.pending++;
});
event.dispatcher.on(event.test.finished, () => {
stats.tests++;
});
Expand Down
3 changes: 3 additions & 0 deletions lib/reporter/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ class Cli extends Base {
for (const test of suite.tests) {
if (!test.state && !this.loadedTests.includes(test.id)) {
if (matchTest(grep, test.title)) {
if (!test.opts) {
test.opts = {};
}
if (!test.opts.skipInfo) {
test.opts.skipInfo = {};
}
Expand Down