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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@
"sass-embedded": "^1.71.0",
"sass-loader": "^14.1.1",
"schema-utils": "^4.2.0",
"selenium-webdriver": "^4.28.1",
"selenium-webdriver": "^4.31.0",
"semver": "^7.5.4",
"serve-handler": "^6.1.2",
"sinon": "^9.0.0",
Expand Down
19 changes: 19 additions & 0 deletions test/e2e/webdriver/driver.js
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,28 @@ class Driver {
/**
* Quits the browser session, closing all windows and tabs.
*
* This was previously implemented as just `await this.driver.quit()`, but on Windows,
* that was causing Google Chrome for Testing to not close, and sit open indefinitely
* taking CPU load. It is also possible that this was causing some cascading errors on CI.
*
* @returns {Promise} promise resolving after quitting
*/
async quit() {
if (this.browser === 'chrome') {
try {
const handles = await this.driver.getAllWindowHandles();

for (const handle of handles) {
await this.driver.switchTo().window(handle);
await this.driver.close();
}
} catch (e) {
console.info(
'Problem encountered closing Chrome windows/tabs, but continuing anyway',
);
}
}

await this.driver.quit();
}

Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27691,7 +27691,7 @@ __metadata:
sass-embedded: "npm:^1.71.0"
sass-loader: "npm:^14.1.1"
schema-utils: "npm:^4.2.0"
selenium-webdriver: "npm:^4.28.1"
selenium-webdriver: "npm:^4.31.0"
semver: "npm:^7.5.4"
serve-handler: "npm:^6.1.2"
ses: "npm:^1.1.0"
Expand Down Expand Up @@ -34034,15 +34034,15 @@ __metadata:
languageName: node
linkType: hard

"selenium-webdriver@npm:^4.28.1":
version: 4.28.1
resolution: "selenium-webdriver@npm:4.28.1"
"selenium-webdriver@npm:^4.31.0":
version: 4.31.0
resolution: "selenium-webdriver@npm:4.31.0"
dependencies:
"@bazel/runfiles": "npm:^6.3.1"
jszip: "npm:^3.10.1"
tmp: "npm:^0.2.3"
ws: "npm:^8.18.0"
checksum: 10/a8917b532d16904d6a76a69be1f3a5db23e1dc520821b3bc276845eb835856691594c2c142eff91519d72bafacd285cf50e9b0db51025ab493b1263bab9caa19
checksum: 10/90d2552fb99ba9c43789b74b3b601b54f72c0122140aa4c806261d695218af306e1147d08fd8cd862957612c9b1f987ea95a0823343eecfc9786f214e14f8a5d
languageName: node
linkType: hard

Expand Down
Loading