Commit baa4ff1

committed

fix: match ios device by type and name

1 parent e98b4a2 commit baa4ff1Copy full SHA for baa4ff1

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,10 +344,16 @@ export class AppiumDriver {`
`344`	`344`	`&& sessionInfoDetails.platformName.toLowerCase() === "ios"`
`345`	`345`	`&& sessionInfoDetails.platformVersion.startsWith("13")) {`
`346`	`346`	`try {`
`347`		`- const devicesInfos = IOSController.devicesDisplaysInfos();`
`348`		`- const matches = devicesInfos.filter(d => sessionInfoDetails.deviceName.includes(d.deviceType));`
`349`		`- if (matches && matches.length > 0) {`
`350`		`- const deviceType = matches[matches.length - 1];`
	`347`	`+ const devicesInfos = IOSController.devicesDisplaysInfos()`
	`348`	`+ .filter(d => sessionInfoDetails.deviceName.includes(d.deviceType));`
	`349`	`+`
	`350`	`+ if (devicesInfos.length > 0) {`
	`351`	`+ // sort devices by best match - in case we have iPhone XR 13 -> it will match device type 'iPhone X' and 'iPhone XR' -> after sort we will pick first longest match`
	`352`	`+ devicesInfos`
	`353`	`+ .sort((a, b) => {`
	`354`	`+ return sessionInfoDetails.deviceName.replace(a.deviceType, "").length - sessionInfoDetails.deviceName.replace(b.deviceType, "").length`
	`355`	`+ });`
	`356`	`+ const deviceType = devicesInfos[0];`
`351`	`357`	`args.device.viewportRect.y += deviceType.actionBarHeight;`
`352`	`358`	`args.device.viewportRect.height -= deviceType.actionBarHeight;`
`353`	`359`	`}`

Comments

(0)