From cc03cbd66f53382b17f83d7d7022e44d4e7316d7 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Fri, 21 Jul 2023 07:33:59 +0200 Subject: [PATCH] Fix for Chromedriver 115 bug. https://github.com/sitespeedio/browsertime/issues/1968 --- lib/chrome/webdriver/setupChromiumOptions.js | 9 +++++ package-lock.json | 36 +++++--------------- package.json | 2 +- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/lib/chrome/webdriver/setupChromiumOptions.js b/lib/chrome/webdriver/setupChromiumOptions.js index afa266af4..fdc8194ca 100644 --- a/lib/chrome/webdriver/setupChromiumOptions.js +++ b/lib/chrome/webdriver/setupChromiumOptions.js @@ -1,4 +1,5 @@ import { readFileSync } from 'node:fs'; +import { platform } from 'node:os'; import intel from 'intel'; import { chromeDesktopOptions as defaultChromeOptions } from '../settings/chromeDesktopOptions.js'; import { chromeAndroidOptions as defaultAndroidChromeOptions } from '../settings/chromeAndroidOptions.js'; @@ -188,6 +189,14 @@ 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 44b9397cd..b99b2269b 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": "114.0.5735-90", + "@sitespeed.io/chromedriver": "115.0.5790-98b", "@sitespeed.io/edgedriver": "113.0.1774-9b", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", @@ -792,26 +792,15 @@ } }, "node_modules/@sitespeed.io/chromedriver": { - "version": "114.0.5735-90", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", - "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", + "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==", "hasInstallScript": true, "dependencies": { - "node-downloader-helper": "2.1.5", + "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" } }, - "node_modules/@sitespeed.io/chromedriver/node_modules/node-downloader-helper": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", - "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==", - "bin": { - "ndh": "bin/ndh" - }, - "engines": { - "node": ">=14.18" - } - }, "node_modules/@sitespeed.io/edgedriver": { "version": "113.0.1774-9b", "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-113.0.1774-9b.tgz", @@ -6687,19 +6676,12 @@ } }, "@sitespeed.io/chromedriver": { - "version": "114.0.5735-90", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", - "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", + "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==", "requires": { - "node-downloader-helper": "2.1.5", + "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" - }, - "dependencies": { - "node-downloader-helper": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", - "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==" - } } }, "@sitespeed.io/edgedriver": { diff --git a/package.json b/package.json index 4c707de36..338715e45 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": "114.0.5735-90", + "@sitespeed.io/chromedriver": "115.0.5790-98b", "@sitespeed.io/edgedriver": "113.0.1774-9b", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0",