Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix playwright config merging for webServer property #65090

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Fix playwright config merging for webServer property #65090

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
15 changes: 11 additions & 4 deletions packages/next/src/experimental/testmode/playwright/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ export function defineConfig<T extends NextOptionsConfig, W>(
export function defineConfig<T extends NextOptionsConfig = NextOptionsConfig>(
config: base.PlaywrightTestConfig<T>
): base.PlaywrightTestConfig<T> {
return base.defineConfig<T>(
defaultPlaywrightConfig as base.PlaywrightTestConfig<T>,
config
)
if (config.webServer !== undefined) {
// Playwright doesn't merge the `webServer` field as we'd expect, so remove our default if the user specifies one.
const { webServer, ...partialDefaultPlaywrightConfig } =
defaultPlaywrightConfig as base.PlaywrightTestConfig<T>
return base.defineConfig<T>(partialDefaultPlaywrightConfig, config)
} else {
return base.defineConfig<T>(
defaultPlaywrightConfig as base.PlaywrightTestConfig<T>,
config
)
}
}

export type { NextFixture, NextOptions }
Expand Down
Loading