Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(coverage): workspaces c8 source maps #3226

Merged
merged 2 commits into from
Apr 27, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/coverage-c8/src/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@ export class C8CoverageProvider extends BaseCoverageProvider implements Coverage
const sourceMapMeta: Record<SourceMapMeta['url'], MapAndSource> = {}
const extensions = Array.isArray(this.options.extension) ? this.options.extension : [this.options.extension]

const fetchCache = this.ctx.projects.map(project =>
AriPerkkio marked this conversation as resolved.
Show resolved Hide resolved
Array.from(project.vitenode.fetchCache.entries()),
).flat()

const entries = Array
.from(this.ctx.vitenode.fetchCache.entries())
.from(fetchCache)
.filter(entry => report._shouldInstrument(entry[0]))
.map(([file, { result }]) => {
if (!result.map)
Expand Down
6 changes: 6 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions test/workspaces/coverage-report-tests/check-coverage.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { existsSync, readFileSync } from 'node:fs'
import { normalize } from 'node:path'
import { expect, test } from 'vitest'
import libCoverage from 'istanbul-lib-coverage'
import { resolve } from 'pathe'

test('coverage exists', () => {
expect(existsSync('./coverage')).toBe(true)
expect(existsSync('./coverage/index.html')).toBe(true)
})

test('file coverage summary matches', () => {
const coverageJson = JSON.parse(readFileSync('./coverage/coverage-final.json', 'utf-8'))
const coverageMap = libCoverage.createCoverageMap(coverageJson)
const fileCoverage = coverageMap.fileCoverageFor(normalize(resolve('./src/math.ts')))

// There should be 1 uncovered branch and 1 uncovered function. See math.ts.
const { branches, functions } = fileCoverage.toSummary()

expect(branches.total - branches.covered).toBe(1)
expect(functions.total - functions.covered).toBe(1)
})
7 changes: 7 additions & 0 deletions test/workspaces/coverage-report-tests/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from 'vitest/config'

export default defineConfig({
test: {
include: ['./check-coverage.test.ts'],
},
})
7 changes: 5 additions & 2 deletions test/workspaces/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
"type": "module",
"private": true,
"scripts": {
"test": "vitest",
"coverage": "vitest run --coverage"
"test": "pnpm test:workspace && pnpm test:coverage",
"test:workspace": "vitest run",
"test:coverage": "vitest run --root coverage-report-tests"
},
"devDependencies": {
"@types/istanbul-lib-coverage": "^2.0.4",
"istanbul-lib-coverage": "^3.2.0",
"jsdom": "latest",
"vitest": "workspace:*"
}
Expand Down
11 changes: 11 additions & 0 deletions test/workspaces/src/math.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/* eslint-disable unused-imports/no-unused-vars */
export function sum(a: number, b: number) {
if (a === 3 && b === 4) {
// This should be uncovered
return 7
}

return a + b
}

function uncoveredFunction() {
// This should be uncovered
return 1
}
1 change: 1 addition & 0 deletions test/workspaces/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if (process.env.TEST_WATCH) {
export default defineConfig({
test: {
coverage: {
enabled: true,
all: true,
},
reporters: ['default', 'json'],
Expand Down