Skip to content

fix: correctly resolve nested mocks with index file #6266

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 2, 2024
Merged

fix: correctly resolve nested mocks with index file #6266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/vitest/src/runtime/mocker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,10 @@ export class VitestMocker {
return null
}

const files = readdirSync(mockFolder)
const baseOriginal = basename(path)

function findFile(files: string[], baseOriginal: string): string | null {
function findFile(mockFolder: string, baseOriginal: string): string | null {
const files = readdirSync(mockFolder)
for (const file of files) {
const baseFile = basename(file, extname(file))
if (baseFile === baseOriginal) {
Expand All @@ -326,7 +326,7 @@ export class VitestMocker {
}
else {
// find folder/index.{js,ts}
const indexFile = findFile(readdirSync(path), 'index')
const indexFile = findFile(path, 'index')
if (indexFile) {
return indexFile
}
Expand All @@ -336,7 +336,7 @@ export class VitestMocker {
return null
}

return findFile(files, baseOriginal)
return findFile(mockFolder, baseOriginal)
}

const dir = dirname(path)
Expand Down
0 test/core/__mocks__/axios.ts → test/core/__mocks__/axios/index.ts
View file
Open in desktop
File renamed without changes.