fix(vitest): override config.include option with config.browser.instances[].include option if it is specified (#8260)

Shinyaigeek · web-flow · commit 010fc55b527f · 2025-08-04T13:17:14.000+02:00
diff --git a/packages/vitest/src/node/projects/resolveProjects.ts b/packages/vitest/src/node/projects/resolveProjects.ts
@@ -303,8 +303,9 @@ function cloneConfig(project: TestProject, { browser, ...config }: BrowserInstan
     ...overrideConfig
   } = config
   const currentConfig = project.config.browser
+  const clonedConfig = deepClone(project.config)
   return mergeConfig<any, any>({
-    ...deepClone(project.config),
+    ...clonedConfig,
     browser: {
       ...project.config.browser,
       locators: locators
@@ -321,6 +322,10 @@ function cloneConfig(project: TestProject, { browser, ...config }: BrowserInstan
       providerOptions: config,
       instances: undefined, // projects cannot spawn more configs
     },
+    // If there is no include or exclude or includeSource pattern in browser.instances[], we should use the that's pattern from the parent project
+    include: (overrideConfig.include && overrideConfig.include.length > 0) ? [] : clonedConfig.include,
+    exclude: (overrideConfig.exclude && overrideConfig.exclude.length > 0) ? [] : clonedConfig.exclude,
+    includeSource: (overrideConfig.includeSource && overrideConfig.includeSource.length > 0) ? [] : clonedConfig.includeSource,
     // TODO: should resolve, not merge/override
   } satisfies ResolvedConfig, overrideConfig) as ResolvedConfig
 }
diff --git a/test/config/test/browser-configs.test.ts b/test/config/test/browser-configs.test.ts
@@ -234,6 +234,81 @@ test('coverage provider v8 works correctly in workspaced browser mode if instanc
   ])
 })
 
+test('browser instances with include/exclude/includeSource option override parent that patterns', async () => {
+  const { projects } = await vitest({}, {
+    include: ['**/*.global.test.{js,ts}', '**/*.shared.test.{js,ts}'],
+    exclude: ['**/*.skip.test.{js,ts}'],
+    includeSource: ['src/**/*.{js,ts}'],
+    browser: {
+      enabled: true,
+      headless: true,
+      instances: [
+        { browser: 'chromium' },
+        { browser: 'firefox', include: ['test/firefox-specific.test.ts'], exclude: ['test/webkit-only.test.ts', 'test/webkit-extra.test.ts'], includeSource: ['src/firefox-compat.ts'] },
+        { browser: 'webkit', include: ['test/webkit-only.test.ts', 'test/webkit-extra.test.ts'], exclude: ['test/firefox-specific.test.ts'], includeSource: ['src/webkit-compat.ts'] },
+      ],
+    },
+  })
+
+  // Chromium should inherit parent include/exclude/includeSource patterns (plus default test pattern)
+  expect(projects[0].name).toEqual('chromium')
+  expect(projects[0].config.include).toEqual([
+    'test/**.test.ts',
+    '**/*.global.test.{js,ts}',
+    '**/*.shared.test.{js,ts}',
+  ])
+  expect(projects[0].config.exclude).toEqual([
+    '**/*.skip.test.{js,ts}',
+  ])
+  expect(projects[0].config.includeSource).toEqual([
+    'src/**/*.{js,ts}',
+  ])
+
+  // Firefox should only have its specific include/exclude/includeSource pattern (not parent patterns)
+  expect(projects[1].name).toEqual('firefox')
+  expect(projects[1].config.include).toEqual([
+    'test/firefox-specific.test.ts',
+  ])
+  expect(projects[1].config.exclude).toEqual([
+    'test/webkit-only.test.ts',
+    'test/webkit-extra.test.ts',
+  ])
+  expect(projects[1].config.includeSource).toEqual([
+    'src/firefox-compat.ts',
+  ])
+
+  // Webkit should only have its specific include/exclude/includeSource patterns (not parent patterns)
+  expect(projects[2].name).toEqual('webkit')
+  expect(projects[2].config.include).toEqual([
+    'test/webkit-only.test.ts',
+    'test/webkit-extra.test.ts',
+  ])
+  expect(projects[2].config.exclude).toEqual([
+    'test/firefox-specific.test.ts',
+  ])
+  expect(projects[2].config.includeSource).toEqual([
+    'src/webkit-compat.ts',
+  ])
+})
+
+test('browser instances with empty include array should get parent include patterns', async () => {
+  const { projects } = await vitest({}, {
+    include: ['**/*.test.{js,ts}'],
+    browser: {
+      enabled: true,
+      headless: true,
+      instances: [
+        { browser: 'chromium', include: [] },
+        { browser: 'firefox' },
+      ],
+    },
+  })
+
+  // Both instances should inherit parent include patterns when include is empty or not specified
+  expect(projects[0].config.include).toEqual(['test/**.test.ts', '**/*.test.{js,ts}'])
+  expect(projects[1].config.include).toEqual(['test/**.test.ts', '**/*.test.{js,ts}'])
+})
+
 test('filter for the global browser project includes all browser instances', async () => {
   const { projects } = await vitest({ project: 'myproject' }, {
     projects: [
