From 081cfe039955f11102bd116e260a062afff324b0 Mon Sep 17 00:00:00 2001
From: Vladimir <sleuths.slews0s@icloud.com>
Date: Fri, 2 Aug 2024 11:10:29 +0200
Subject: [PATCH] fix: correctly resolve nested mocks with `index` file (#6266)

---
 packages/vitest/src/runtime/mocker.ts            | 8 ++++----
 test/core/__mocks__/{axios.ts => axios/index.ts} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename test/core/__mocks__/{axios.ts => axios/index.ts} (100%)

diff --git a/packages/vitest/src/runtime/mocker.ts b/packages/vitest/src/runtime/mocker.ts
index dd87c9b1ef96..7d3d0819a048 100644
--- 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 b/test/core/__mocks__/axios/index.ts
similarity index 100%
rename from test/core/__mocks__/axios.ts
rename to test/core/__mocks__/axios/index.ts