fix: correctly resolve nested mocks with index file (#6266)

vitest-dev · Aug 2, 2024 · 081cfe0 · 081cfe0
1 parent c72506b
commit 081cfe0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/vitest/src/runtime/mocker.ts b/packages/vitest/src/runtime/mocker.ts
@@ -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) {
@@ -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
               }
@@ -336,7 +336,7 @@ export class VitestMocker {
         return null
       }
 
-      return findFile(files, baseOriginal)
+      return findFile(mockFolder, baseOriginal)
     }
 
     const dir = dirname(path)

diff --git a/test/core/__mocks__/axios.ts → test/core/__mocks__/axios/index.ts b/test/core/__mocks__/axios.ts → test/core/__mocks__/axios/index.ts