Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions packages/vitest/src/node/plugins/testConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,17 @@ export function TestConfigPlugin(
// By default, Vite extends arrays, for example, but CLI options should have the priority
config.test = deepMerge({}, config.test ?? {}, options)

// apply browser CLI options only if the config already has the browser config and not disabled manually
// apply browser CLI options only if the config already has the browser config and not disabled manually,
// but let the API create it for a root config without projects (the CLI can't set `provider` or `instances`)
const createsRootBrowserConfig =
!globalConfig && !config.test.projects && !!(browser?.provider || browser?.instances)
if (
config.test.browser &&
browser &&
(config.test.browser.enabled !== false || browser.enabled)
(config.test.browser || createsRootBrowserConfig) &&
(config.test.browser?.enabled !== false || browser.enabled)
) {
config.test.browser = mergeConfig(
config.test.browser,
config.test.browser ?? {},
browser,
) as ResolvedBrowserOptions
}
Expand Down
37 changes: 37 additions & 0 deletions test/e2e/test/config/browser-configs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,43 @@ test('assigns names as browsers', async () => {
expect(projects.map((p) => p.projectConfig.name)).toEqual(['chromium', 'firefox', 'webkit'])
})

test('applies programmatic browser options without existing browser config', async () => {
const v = await vitest({
$cliConfig: {
browser: {
enabled: true,
headless: true,
provider: preview(),
instances: [{ browser: 'chromium' }],
},
},
})

expect(v.projects.map((project) => project.name)).toEqual(['chromium'])
})

test('applies programmatic browser options only to projects with browser config', async () => {
const v = await vitest({
projects: [
{ test: { name: 'node' } },
{ test: { name: 'browser', browser: { instances: [{ browser: 'chromium' }] } } },
],
$cliConfig: {
browser: {
enabled: true,
headless: true,
provider: preview(),
},
},
})

expect(v.config.browser.enabled).toBe(false)
expect(v.projects.map((project) => [project.name, project.config.browser.enabled])).toEqual([
['node', false],
['browser (chromium)', true],
])
})

test('filters projects', async () => {
const projects = await config({
project: 'chromium',
Expand Down
Loading