vitest-dev
diff --git a/Collapse file
‎packages/vitest/src/node/ast-collect.ts‎
Copy file name to clipboardExpand all lines: packages/vitest/src/node/ast-collect.ts
+3Lines changed: 3 additions & 0 deletions b/Collapse file
‎packages/vitest/src/node/ast-collect.ts‎
Copy file name to clipboardExpand all lines: packages/vitest/src/node/ast-collect.ts
+3Lines changed: 3 additions & 0 deletions
diff --git a/Collapse file
‎test/cli/test/static-collect.test.ts‎
Copy file name to clipboardExpand all lines: test/cli/test/static-collect.test.ts
+91Lines changed: 91 additions & 0 deletions b/Collapse file
‎test/cli/test/static-collect.test.ts‎
Copy file name to clipboardExpand all lines: test/cli/test/static-collect.test.ts
+91Lines changed: 91 additions & 0 deletions
@@ -96,6 +96,9 @@ function astParseFile(filepath: string, code: string) {
       if (
         // direct call as `__vite_ssr_exports_0__.test()`
         callee.object?.name?.startsWith('__vite_ssr_')
+        // Vitest's module mocker uses `__vi_import_N__` for mocked/dynamic imports
+        // e.g. `__vi_import_0__.it()` when vi.mock is present in the file
+        || callee.object?.name?.startsWith('__vi_import_')
         // call as `__vite_ssr_exports_0__.Vitest.test`,
         // this is a special case for using Vitest namespaces popular in Effect
         || (callee.object?.object?.name?.startsWith('__vite_ssr_') && callee.object?.property?.name === 'Vitest')
 
@@ -427,6 +427,97 @@ test('collects tests imported from another file', async () => {
   `)
 })
 
+test('collects tests imported from another file while a vi.mock line is present', async () => {
+  const testModule = await collectTests(`
+    import { describe } from 'vitest';
+    import { it } from './Utils/test-extend.ts';
+      
+    vi.mock('@/composables/test.js', async (importOriginal) => { });
+      
+    describe('should included', () => {
+      it('is included', () => {});
+    });
+
+    describe('top level describe', () => {
+      describe('nested describe', () => {
+        it('is included', ({ server }) => {});
+      });
+    });
+`)
+  expect(testModule).toMatchInlineSnapshot(`
+    {
+      "should included": {
+        "is included": {
+          "errors": [],
+          "fullName": "should included > is included",
+          "id": "-1732721377_0_0",
+          "location": "8:6",
+          "mode": "run",
+          "state": "pending",
+        },
+      },
+      "top level describe": {
+        "nested describe": {
+          "is included": {
+            "errors": [],
+            "fullName": "top level describe > nested describe > is included",
+            "id": "-1732721377_1_0_0",
+            "location": "13:8",
+            "mode": "run",
+            "state": "pending",
+          },
+        },
+      },
+    }
+  `)
+})
+
+test('collects tests imported from another file while a vi.mock line is present and commented', async () => {
+  const testModule = await collectTests(`
+    import { describe } from 'vitest';
+    import { it } from './Utils/test-extend.ts';
+      
+    // vi.mock('@/composables/test.js', async (importOriginal) => { });
+      
+    describe('should included', () => {
+      it('is included', () => {});
+    });
+
+    describe('top level describe', () => {
+      describe('nested describe', () => {
+        it('is included', ({ server }) => {});
+      });
+    });
+`)
+
+  expect(testModule).toMatchInlineSnapshot(`
+    {
+      "should included": {
+        "is included": {
+          "errors": [],
+          "fullName": "should included > is included",
+          "id": "-1732721377_0_0",
+          "location": "8:6",
+          "mode": "run",
+          "state": "pending",
+        },
+      },
+      "top level describe": {
+        "nested describe": {
+          "is included": {
+            "errors": [],
+            "fullName": "top level describe > nested describe > is included",
+            "id": "-1732721377_1_0_0",
+            "location": "13:8",
+            "mode": "run",
+            "state": "pending",
+          },
+        },
+      },
+    }
+  `)
+})
+
 test('collects mixed test function names', async () => {
   const testModule = await collectTests(`
     import { it, test, testUnit, integrationTest } from 'vitest'