Skip to content

fix(browser): apply API options without browser config #10852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sheremet-va wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −5
Open

fix(browser): apply API options without browser config #10852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/vitest/src/node/config/resolveConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ export async function resolveConfig(
configLoader: options.configLoader,
mode: options.mode || 'test',
plugins: [
CliOverride(cliOptionsCopy),
CliOverride(cliOptionsCopy, true),
...VitestConfigServer(pluginsHarness),
...VitestConfig(pluginsHarness),
...VitestCorePlugin(pluginsHarness, options),
Expand Down
8 changes: 4 additions & 4 deletions packages/vitest/src/node/plugins/cliOverride.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { UserConfig } from '../types/config'
import { deepMerge } from '@vitest/utils/helpers'
import { mergeConfig } from 'vite'

export function CliOverride(cliOptions: UserConfig): Plugin {
export function CliOverride(cliOptions: UserConfig, isRootConfig = false): Plugin {
return {
// The CLI plugin overwrites config values with CLI options, making them
// available in the next plugin. We have to do this via plugins because of watch mode.
Expand All @@ -20,10 +20,10 @@ export function CliOverride(cliOptions: UserConfig): Plugin {
// 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
if (config.test.browser && browser && (config.test.browser.enabled !== false || browser.enabled)) {
// Projects must opt into browser mode, but browser options can initialize the root config.
if (browser && (config.test.browser || isRootConfig) && (config.test.browser?.enabled !== false || browser.enabled)) {
config.test.browser = mergeConfig(
config.test.browser,
config.test.browser || {},
browser,
) as ResolvedBrowserOptions
}
Expand Down
15 changes: 15 additions & 0 deletions test/e2e/test/config/browser-configs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,21 @@ test('assigns names as browsers', async () => {
])
})

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('filters projects', async () => {
const projects = await config({
project: 'chromium',
Expand Down
Loading