Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix automatic capabilities conversion from JWP to W3C #277

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −4
Open

fix: fix automatic capabilities conversion from JWP to W3C #277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ac14fb
fix: correctly convert JWP capabilities to W3C
gkalpak Oct 24, 2022
51f5c41
fix: do not convert IE9 from JWP to W3C
gkalpak Oct 24, 2022
a00e886
fix: use `appium:platformVersion` in `browserName` (if present)
gkalpak Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/process-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ export function processConfig(config: any = {}, args: any = {}) {
}

// Browser name that will be printed out by Karma.
const browserName = `${args.browserName} ${args.browserVersion || args.version || ''} ${args.platformName || args.platform || ''}`;
const browserName =
`${args.browserName} ${args.browserVersion || args.version || ''} ` +
`${args.platformName || args.platform || ''} ${args['appium:platformVersion'] || ''}`.trim();

// In case "startConnect" is enabled, and no tunnel identifier has been specified, we just
// generate one randomly. This makes it possible for developers to use "startConnect" with
Expand Down Expand Up @@ -57,17 +59,28 @@ export function processConfig(config: any = {}, args: any = {}) {
};

// transform JWP capabilities into W3C capabilities for backward compatibility
if (isW3C(args)) {
// NOTE: IE9 is the only browser/version that supports **only** JWT.
const isIE9 = (args.browserName.toLowerCase() === 'internet explorer') && (args.version === '9');
if (!isW3C(args) && !isIE9) {
args.browserVersion = args.browserVersion || args.version || 'latest'
args.platformName = args.platformName || args.platform || 'Windows 10'
args['sauce:options'] = {...capabilitiesFromConfig, ...(args['sauce:options'] || {})}

// delete JWP capabilities
delete args.version
delete args.platform
} else {
}

// Move Sauce-specific options to the appropriate place inside capabilities.
// See: https://docs.saucelabs.com/dev/w3c-webdriver-capabilities/index.html#use-sauceoptions
if (isIE9) {
// In JWT format (which IE9 has to use), Sauce-specific options need to be added to the
// top-level capabilities.
args = {...args, ...capabilitiesFromConfig}
} else {
// In W3C format, Sauce-specific options need to be put inside `sauce:options`.
args['sauce:options'] = {...capabilitiesFromConfig, ...(args['sauce:options'] || {})}
}

// Not needed
delete args.base

Expand Down