From 780affdc36e34227a4225589fe04d5371870a4b0 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Tue, 15 Aug 2023 18:19:35 +0200 Subject: [PATCH] New Chromedriver version that fixes the Mac issue. Fixes https://github.com/sitespeedio/browsertime/issues/1968 so we can renmove our fix. --- lib/chrome/webdriver/setupChromiumOptions.js | 8 -------- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lib/chrome/webdriver/setupChromiumOptions.js b/lib/chrome/webdriver/setupChromiumOptions.js index fdc8194ca..8eee3bb11 100644 --- a/lib/chrome/webdriver/setupChromiumOptions.js +++ b/lib/chrome/webdriver/setupChromiumOptions.js @@ -189,14 +189,6 @@ export function setupChromiumOptions( if (browserOptions.binaryPath) { seleniumOptions.setChromeBinaryPath(browserOptions.binaryPath); - } else { - // Fix for https://github.com/sitespeedio/browsertime/issues/1968 - // Same settings for Chrome/Edge - if (options.browser === 'chrome' && platform() === 'darwin') { - seleniumOptions.setChromeBinaryPath( - '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome' - ); - } } if (browserOptions.mobileEmulation) { diff --git a/package-lock.json b/package-lock.json index 33086e5d2..5877cc662 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "115.0.5790-98b", + "@sitespeed.io/chromedriver": "115.0.5790-170", "@sitespeed.io/edgedriver": "115.0.1901-183", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", @@ -791,9 +791,9 @@ } }, "node_modules/@sitespeed.io/chromedriver": { - "version": "115.0.5790-98b", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98b.tgz", - "integrity": "sha512-L1/qyTWor7n/P96fSL2i6GzfgZw2WF3SqXlq5inAYl2fjPHyBaeJUws65hJ0ohZ+VHUwMSJmhSbJClcIonerhQ==", + "version": "115.0.5790-170", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-170.tgz", + "integrity": "sha512-6WNMW7x0N+W7Hi8h89eXgFraum8BuRNocDtB9NZ51SEHAcc8uFtE/s5RpMZB059D7TrJnJ0W/hL3e2kZTB04dA==", "hasInstallScript": true, "dependencies": { "node-downloader-helper": "2.1.7", @@ -6667,9 +6667,9 @@ } }, "@sitespeed.io/chromedriver": { - "version": "115.0.5790-98b", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98b.tgz", - "integrity": "sha512-L1/qyTWor7n/P96fSL2i6GzfgZw2WF3SqXlq5inAYl2fjPHyBaeJUws65hJ0ohZ+VHUwMSJmhSbJClcIonerhQ==", + "version": "115.0.5790-170", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-170.tgz", + "integrity": "sha512-6WNMW7x0N+W7Hi8h89eXgFraum8BuRNocDtB9NZ51SEHAcc8uFtE/s5RpMZB059D7TrJnJ0W/hL3e2kZTB04dA==", "requires": { "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" diff --git a/package.json b/package.json index 03bb93b78..bbfa611fb 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "115.0.5790-98b", + "@sitespeed.io/chromedriver": "115.0.5790-170", "@sitespeed.io/edgedriver": "115.0.1901-183", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0",