Skip to content

Commit 5f1ef6e

Browse files
committed
ci: fix Sauce Labs E2E browser tests with Sauce Connect 5 and legacy JWP capabilities
- Pass `--proxy-localhost allow` to Sauce Connect 5 (`saucelabs/sauce-connect-action@v3`) in CI workflow to permit remote Sauce Labs browser VMs to access `http://localhost:2000/`. - Preserve legacy JWP capability keys (`version`, `platform`) alongside W3C capability keys (`browserVersion`, `platformName`) in `protractor-saucelabs.conf.js` for compatibility with Protractor 7 (`selenium-webdriver@3.6.0`).
1 parent 1c2a17e commit 5f1ef6e

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ jobs:
225225
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
226226
region: us-west-1
227227
tunnelName: ${{ env.SAUCE_TUNNEL_IDENTIFIER }}
228+
args: --proxy-localhost allow
228229
- name: Run E2E Browser tests
229230
env:
230231
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}

tests/e2e/assets/protractor-saucelabs.conf.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,22 @@ exports.config = {
6363

6464
// NOTE: https://saucelabs.com/products/platform-configurator can be used to determine configuration values
6565
multiCapabilities: capabilities.map((caps) => {
66-
const { version, platform, ...rest } = caps;
67-
const w3cCaps = {
68-
...rest,
69-
browserVersion: version,
70-
platformName: platform,
66+
const config = {
67+
...caps,
68+
browserVersion: caps.version,
69+
platformName: caps.platform,
7170
};
7271

7372
if (tunnelIdentifier) {
7473
return {
75-
...w3cCaps,
74+
...config,
7675
'sauce:options': {
7776
tunnelName: tunnelIdentifier,
7877
},
7978
};
8079
}
8180

82-
return w3cCaps;
81+
return config;
8382
}),
8483

8584
// Only allow one session at a time to prevent over saturation of Saucelabs sessions.

0 commit comments

Comments
 (0)