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
8 changes: 5 additions & 3 deletions packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"*.d.ts",
"context.js",
"dist",
"dummy.js",
"providers"
],
"scripts": {
Expand All @@ -73,7 +74,7 @@
"peerDependencies": {
"playwright": "*",
"vitest": "workspace:*",
"webdriverio": "*"
"webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0"
},
"peerDependenciesMeta": {
"playwright": {
Expand Down Expand Up @@ -103,7 +104,8 @@
"@vitest/runner": "workspace:*",
"@vitest/ui": "workspace:*",
"@vitest/ws-client": "workspace:*",
"@wdio/protocols": "^8.40.3",
"@wdio/protocols": "^9.7.0",
"@wdio/types": "^9.9.0",
"birpc": "0.2.19",
"flatted": "^3.3.3",
"ivya": "^1.1.1",
Expand All @@ -114,6 +116,6 @@
"playwright-core": "^1.50.1",
"safaridriver": "^1.0.0",
"vitest": "workspace:*",
"webdriverio": "^8.42.0"
"webdriverio": "^9.10.0"
}
}
6 changes: 4 additions & 2 deletions packages/browser/providers/webdriverio.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import type { RemoteOptions, ClickOptions, DragAndDropOptions } from 'webdriverio'
import type { remote, ClickOptions, DragAndDropOptions } from 'webdriverio'
import '../matchers.js'
import type {} from "vitest/node"

declare module 'vitest/node' {
export interface BrowserProviderOptions extends Partial<RemoteOptions> {}
export interface BrowserProviderOptions extends Partial<
Parameters<typeof remote>[0]
> {}

export interface UserEventClickOptions extends ClickOptions {}

Expand Down
7 changes: 7 additions & 0 deletions packages/browser/src/client/tester/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ export function setupConsoleLogSpy(): void {
function stdout(base: (...args: unknown[]) => void) {
return (...args: unknown[]) => {
base(...args)
// ignore shadow root logs from wdio
// https://github.com/webdriverio/webdriverio/discussions/14221
if (args[0] === '[WDIO]') {
if (args[1] === 'newShadowRoot' || args[1] === 'removeShadowRoot') {
return
}
}
sendLog('stdout', processLog(args))
}
}
Expand Down
32 changes: 22 additions & 10 deletions packages/browser/src/node/providers/webdriver.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { Capabilities } from '@wdio/types'
import type {
BrowserProvider,
BrowserProviderInitializationOptions,
TestProject,
} from 'vitest/node'
import type { RemoteOptions } from 'webdriverio'

const webdriverBrowsers = ['firefox', 'chrome', 'edge', 'safari'] as const
type WebdriverBrowser = (typeof webdriverBrowsers)[number]
Expand All @@ -22,7 +22,7 @@ export class WebdriverBrowserProvider implements BrowserProvider {
private browserName!: WebdriverBrowser
private project!: TestProject

private options?: RemoteOptions
private options?: Capabilities.WebdriverIOConfig

getSupportedBrowsers(): readonly string[] {
return webdriverBrowsers
Expand All @@ -34,20 +34,32 @@ export class WebdriverBrowserProvider implements BrowserProvider {
): Promise<void> {
this.project = ctx
this.browserName = browser
this.options = options as RemoteOptions
this.options = options as Capabilities.WebdriverIOConfig
}

async switchToTestFrame(): Promise<void> {
const page = this.browser!
const iframe = await page.findElement(
'css selector',
'iframe[data-vitest]',
)
await page.switchToFrame(iframe)
// support wdio@9
if (page.switchFrame) {
await page.switchFrame(page.$('iframe[data-vitest]'))
}
else {
const iframe = await page.findElement(
'css selector',
'iframe[data-vitest]',
)
await page.switchToFrame(iframe)
}
}

async switchToMainFrame(): Promise<void> {
await this.browser!.switchToParentFrame()
const page = this.browser!
if (page.switchFrame) {
await page.switchFrame(null)
}
else {
await page.switchToParentFrame()
}
}

getCommandsContext(): {
Expand Down Expand Up @@ -86,7 +98,7 @@ export class WebdriverBrowserProvider implements BrowserProvider {
}

private buildCapabilities() {
const capabilities: RemoteOptions['capabilities'] = {
const capabilities: Capabilities.WebdriverIOConfig['capabilities'] = {
...this.options?.capabilities,
browserName: this.browserName,
}
Expand Down
Loading