Skip to content

Commit 488e4b9

Browse files
authoredJan 19, 2023
fix: remove setup files from coverage (#2574)
Closes #2190
1 parent 3d8ef76 commit 488e4b9

File tree

5 files changed

+24
-1
lines changed

5 files changed

+24
-1
lines changed
 

‎packages/vitest/src/node/config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { resolveModule } from 'local-pkg'
2-
import { normalize, resolve } from 'pathe'
2+
import { normalize, relative, resolve } from 'pathe'
33
import c from 'picocolors'
44
import type { ResolvedConfig as ResolvedViteConfig } from 'vite'
55

@@ -190,6 +190,7 @@ export function resolveConfig(
190190
?? resolve(resolved.root, file),
191191
),
192192
)
193+
resolved.coverage.exclude.push(...resolved.setupFiles.map(file => relative(resolved.root, file)))
193194

194195
resolved.forceRerunTriggers = [
195196
...resolved.forceRerunTriggers,

‎test/coverage-test/coverage-report-tests/generic.report.test.ts

+13
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,16 @@ test('file using import.meta.env is included in report', async () => {
5050

5151
expect(files).toContain('importEnv.ts.html')
5252
})
53+
54+
test('files should not contain a setup file', () => {
55+
const coveragePath = resolve('./coverage')
56+
const files = fs.readdirSync(coveragePath)
57+
58+
expect(files).not.toContain('coverage-test')
59+
expect(files).not.toContain('setup.ts.html')
60+
61+
const coverageSrcPath = resolve('./coverage/src')
62+
const srcFiles = fs.readdirSync(coverageSrcPath)
63+
64+
expect(srcFiles).not.toContain('another-setup.ts.html')
65+
})

‎test/coverage-test/setup.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// eslint-disable-next-line no-console
2+
console.log('Test Setup File')
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// eslint-disable-next-line no-console
2+
console.log('Another Setup File')

‎test/coverage-test/vitest.config.ts

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { resolve } from 'pathe'
12
import { defineConfig } from 'vitest/config'
23
import vue from '@vitejs/plugin-vue'
34

@@ -16,5 +17,9 @@ export default defineConfig({
1617
all: true,
1718
reporter: ['html', 'text', 'lcov', 'json'],
1819
},
20+
setupFiles: [
21+
resolve(__dirname, './setup.ts'),
22+
'./src/another-setup.ts',
23+
],
1924
},
2025
})

0 commit comments

Comments
 (0)
Please sign in to comment.