Skip to content

Commit a86ca31

Browse files
authored
Merge branch 'main' into compass-8693-use-ccs-for-ws-proxy
2 parents e55fe42 + 2e1a3dc commit a86ca31

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

docs/tracking-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Compass Tracking Plan
33

4-
Generated on Mon, Jan 6, 2025 at 09:18 AM
4+
Generated on Mon, Jan 6, 2025 at 03:17 PM
55

66
## Table of Contents
77

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/compass-e2e-tests/helpers/compass.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ const packageCompassAsync = promisify(packageCompass);
6565
// should we test compass-web (true) or compass electron (false)?
6666
export const TEST_COMPASS_WEB = isTestingWeb();
6767

68+
// Extending the WebdriverIO's types to allow a verbose option to the chromedriver
69+
declare global {
70+
// eslint-disable-next-line @typescript-eslint/no-namespace
71+
namespace WebdriverIO {
72+
interface ChromedriverOptions {
73+
verbose?: boolean;
74+
}
75+
}
76+
}
77+
6878
/*
6979
A helper so we can easily find all the tests we're skipping in compass-web.
7080
Reason is there so you can fill it in and have it show up in search results
@@ -663,10 +673,7 @@ async function startCompassElectron(
663673
let browser: CompassBrowser;
664674

665675
try {
666-
// webdriverio's type is wrong for
667-
// options.capabilities['wdio:chromedriverOptions'] and it doesn't allow
668-
// verbose even though it does work
669-
browser = (await remote(options as any)) as CompassBrowser;
676+
browser = (await remote(options)) as CompassBrowser;
670677
} catch (err) {
671678
debug('Failed to start remote webdriver session', {
672679
error: (err as Error).stack,

packages/compass-e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"debug": "^4.3.4",
5353
"depcheck": "^1.4.1",
5454
"electron": "^32.2.7",
55-
"electron-to-chromium": "^1.5.75",
55+
"electron-to-chromium": "^1.5.76",
5656
"eslint": "^7.25.0",
5757
"glob": "^10.2.5",
5858
"hadron-build": "^25.5.17",

0 commit comments

Comments
 (0)