Skip to content

Commit 4a70e26

Browse files
MoLowalexfernandez
authored andcommitted
test_runner: fix typescript coverage
PR-URL: nodejs#49406 Fixes: nodejs#49398 Reviewed-By: Chemi Atlow <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 5aff70a commit 4a70e26

File tree

5 files changed

+35
-5
lines changed

5 files changed

+35
-5
lines changed

lib/internal/test_runner/coverage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function mapRangeToLines(range, lines) {
338338
mid = MathFloor((start + end) / 2);
339339
let line = lines[mid];
340340

341-
if (startOffset >= line.startOffset && startOffset <= line.endOffset) {
341+
if (startOffset >= line?.startOffset && startOffset <= line?.endOffset) {
342342
while (endOffset > line?.startOffset) {
343343
// If the range is not covered, and the range covers the entire line,
344344
// then mark that line as not covered.
@@ -363,7 +363,7 @@ function mapRangeToLines(range, lines) {
363363
}
364364

365365
break;
366-
} else if (startOffset >= line.endOffset) {
366+
} else if (startOffset >= line?.endOffset) {
367367
start = mid + 1;
368368
} else {
369369
end = mid - 1;
@@ -538,4 +538,4 @@ function doesRangeContainOtherRange(range, otherRange) {
538538
range.endOffset >= otherRange.endOffset;
539539
}
540540

541-
module.exports = { setupCoverage };
541+
module.exports = { setupCoverage, TestCoverage };

lib/internal/test_runner/test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ class Test extends AsyncResource {
737737
this.reported = true;
738738
reporter.plan(nesting, loc, harness.counters.topLevel);
739739

740+
// Call this harness.coverage() before collecting diagnostics, since failure to collect coverage is a diagnostic.
741+
const coverage = harness.coverage();
740742
for (let i = 0; i < diagnostics.length; i++) {
741743
reporter.diagnostic(nesting, loc, diagnostics[i]);
742744
}
@@ -750,8 +752,6 @@ class Test extends AsyncResource {
750752
reporter.diagnostic(nesting, loc, `todo ${harness.counters.todo}`);
751753
reporter.diagnostic(nesting, loc, `duration_ms ${this.duration()}`);
752754

753-
const coverage = harness.coverage();
754-
755755
if (coverage) {
756756
reporter.coverage(nesting, loc, coverage);
757757
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Flags: --expose-internals --experimental-test-coverage
2+
3+
'use strict';
4+
require('../../../common');
5+
const { TestCoverage } = require('internal/test_runner/coverage');
6+
const { test, mock } = require('node:test');
7+
8+
mock.method(TestCoverage.prototype, 'summary', () => {
9+
throw new Error('Failed to collect coverage');
10+
});
11+
12+
test('ok');
13+
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
TAP version 13
2+
# Subtest: ok
3+
ok 1 - ok
4+
---
5+
duration_ms: *
6+
...
7+
1..1
8+
# Warning: Could not report code coverage. Error: Failed to collect coverage
9+
# tests 1
10+
# suites 0
11+
# pass 1
12+
# fail 0
13+
# cancelled 0
14+
# skipped 0
15+
# todo 0
16+
# duration_ms *

test/parallel/test-runner-output.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ const tests = [
8787
replaceTestDuration,
8888
),
8989
},
90+
process.features.inspector ? { name: 'test-runner/output/coverage_failure.js' } : false,
9091
]
9192
.filter(Boolean)
9293
.map(({ name, tty, transform }) => ({

0 commit comments

Comments
 (0)