Skip to content

Commit 96a9032

Browse files
authored
perf: resolve CLI file filters once instead of per test file (#11935)
1 parent 9fd1f22 commit 96a9032

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

‎packages/vitest/src/node/projects/globProjectFiles.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,23 @@ export function filterTestFiles(testFiles: string[], filters: string[], dir: str
7171
if (process.platform === 'win32') {
7272
filters = filters.map((f) => slash(f))
7373
}
74+
const patterns = filters.map((f) => {
75+
const relativePath = f.endsWith('/') ? join(relative(dir, f), '/') : relative(dir, f)
76+
return {
77+
filter: f,
78+
isAbsolute: isAbsolute(f),
79+
lowerCase: f.toLocaleLowerCase(),
80+
relativeLowerCase: relativePath.toLocaleLowerCase(),
81+
}
82+
})
7483
return testFiles.filter((t) => {
7584
const testFile = relative(dir, t).toLocaleLowerCase()
76-
return filters.some((f) => {
85+
return patterns.some((p) => {
7786
// if filter is a full file path, we should include it if it's in the same folder
78-
if (isAbsolute(f) && t.startsWith(f)) {
87+
if (p.isAbsolute && t.startsWith(p.filter)) {
7988
return true
8089
}
81-
82-
const relativePath = f.endsWith('/') ? join(relative(dir, f), '/') : relative(dir, f)
83-
return (
84-
testFile.includes(f.toLocaleLowerCase()) ||
85-
testFile.includes(relativePath.toLocaleLowerCase())
86-
)
90+
return testFile.includes(p.lowerCase) || testFile.includes(p.relativeLowerCase)
8791
})
8892
})
8993
}

‎test/e2e/test/testname-pattern.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { runVitest, useFS } from '../../test-utils'
55
test.each([
66
{ filter: 'example' },
77
{ filter: '/example' },
8+
{ filter: 'EXAMPLE' },
9+
{ filter: 'fixtures/filters/test/example' },
810
{ filter: resolve('./fixtures/filters/test/example') },
911
])('match by partial pattern $filter', async ({ filter }) => {
1012
const { stdout } = await runVitest({ root: './fixtures/filters' }, [filter])

0 commit comments

Comments
 (0)