Skip to content

Commit 53924b2

Browse files
committed
test_runner: fix typescript coverage
1 parent 9848352 commit 53924b2

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

lib/internal/test_runner/coverage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ function mapRangeToLines(range, lines) {
313313
mid = MathFloor((start + end) / 2);
314314
let line = lines[mid];
315315

316-
if (startOffset >= line.startOffset && startOffset <= line.endOffset) {
316+
if (startOffset >= line?.startOffset && startOffset <= line?.endOffset) {
317317
while (endOffset > line?.startOffset) {
318318
// If the range is not covered, and the range covers the entire line,
319319
// then mark that line as not covered.
@@ -333,7 +333,7 @@ function mapRangeToLines(range, lines) {
333333
}
334334

335335
break;
336-
} else if (startOffset >= line.endOffset) {
336+
} else if (startOffset >= line?.endOffset) {
337337
start = mid + 1;
338338
} else {
339339
end = mid - 1;

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
}

0 commit comments

Comments
 (0)