Skip to content
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

Jump to bottom

fix(browser): avoid safaridriver collision #4863

Merged
merged 1 commit into from
Jan 4, 2024
Merged

fix(browser): avoid safaridriver collision #4863

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
1 change: 0 additions & 1 deletion packages/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
},
"peerDependencies": {
"playwright": "*",
"safaridriver": "*",
"vitest": "^1.0.0",
"webdriverio": "*"
},
Expand Down
10 changes: 0 additions & 10 deletions packages/browser/src/node/providers/webdriver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export class WebdriverBrowserProvider implements BrowserProvider {
public name = 'webdriverio'

private cachedBrowser: WebdriverIO.Browser | null = null
private stopSafari: () => void = () => {}
private browser!: WebdriverBrowser
private ctx!: WorkspaceProject

Expand All @@ -39,14 +38,6 @@ export class WebdriverBrowserProvider implements BrowserProvider {
if (this.browser === 'safari') {
if (options.headless)
throw new Error('You\'ve enabled headless mode for Safari but it doesn\'t currently support it.')

const safaridriver = await import('safaridriver')
safaridriver.start({ diagnose: true })
this.stopSafari = () => safaridriver.stop()

process.on('beforeExit', () => {
safaridriver.stop()
})
}

const { remote } = await import('webdriverio')
Expand Down Expand Up @@ -97,7 +88,6 @@ export class WebdriverBrowserProvider implements BrowserProvider {

async close() {
await Promise.all([
this.stopSafari(),
this.cachedBrowser?.sessionId ? this.cachedBrowser?.deleteSession?.() : null,
])
// TODO: right now process can only exit with timeout, if we use browser
Expand Down
1 change: 1 addition & 0 deletions test/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"test": "pnpm run test:webdriverio && pnpm run test:playwright",
"test:webdriverio": "PROVIDER=webdriverio node --test specs/",
"test:playwright": "PROVIDER=playwright node --test specs/",
"test:safaridriver": "PROVIDER=webdriverio BROWSER=safari node --test specs/",
"coverage": "vitest --coverage.enabled --coverage.provider=istanbul --browser.headless=yes"
},
"devDependencies": {
Expand Down
6 changes: 5 additions & 1 deletion test/browser/specs/runner.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ import test from 'node:test'
import { execa } from 'execa'

const browser = process.env.BROWSER || (process.env.PROVIDER === 'playwright' ? 'chromium' : 'chrome')
const argv = ['vitest', '--run', `--browser.name=${browser}`]

const { stderr, stdout } = await execa('npx', ['vitest', '--run', `--browser.name=${browser}`, '--browser.headless'], {
if (browser !== 'safari')
argv.push('--browser.headless')

const { stderr, stdout } = await execa('npx', argv, {
env: {
...process.env,
CI: 'true',
Expand Down