Commit 21cdc41

author

Zdravko

authored

Merge pull request #263 from NativeScript/zbranzov/appium-fix

Zbranzov/appium-save-images

2 parents 6f91d58 + 0147399 commit 21cdc41Copy full SHA for 21cdc41

File tree

2 files changed

-6

lines changed

lib
- device-manager.ts
- image-helper.ts

2 files changed

-6

lines changed

`‎lib/device-manager.ts‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,7 @@ export class DeviceManager implements IDeviceManager {`
`174`	`174`	`apiLevel: platformVersion \|\| args.appiumCaps.platformVersion,`
`175`	`175`	`config: { "density": args.appiumCaps.density, "offsetPixels": args.appiumCaps.offsetPixels }`
`176`	`176`	`}`
`177`		`-`
`178`		`- delete args.appiumCaps.density;`
`179`		`- delete args.appiumCaps.offsetPixels;`
	`177`	`+`
`180`	`178`	`DeviceManager.cleanUnsetProperties(device);`
`181`	`179`
`182`	`180`	`return device;`

`‎lib/image-helper.ts‎`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,9 @@ export class ImageHelper {`
`102`	`102`	`ImageHelper.fullClone(this._args.device.viewportRect, this._defaultOptions.cropRectangle)`
`103`	`103`	`}`
`104`	`104`	`if (!this._defaultOptions.cropRectangle`
`105`		`- \|\| !isNumber(this._defaultOptions.cropRectangle.y)) {`
	`105`	`+ \|\| !isNumber(this._defaultOptions.cropRectangle.y)\|\|this._args.appiumCaps.offsetPixels>0) {`
`106`	`106`	`this._defaultOptions.cropRectangle = this._defaultOptions.cropRectangle \|\| {};`
`107`		`- this._defaultOptions.cropRectangle.y = this._args.device.config.offsetPixels \|\| 0;`
	`107`	`+ this._defaultOptions.cropRectangle.y = this._args.appiumCaps.offsetPixels\|\|this._args.device.config.offsetPixels \|\| 0;`
`108`	`108`	`this._defaultOptions.cropRectangle.x = 0;`
`109`	`109`	`if (this._args.device.deviceScreenSize && this._args.device.deviceScreenSize.width && this._args.device.deviceScreenSize.height) {`
`110`	`110`	`this._defaultOptions.cropRectangle.height = this._args.device.deviceScreenSize.height - this._defaultOptions.cropRectangle.y;`
`@@ -270,8 +270,12 @@ export class ImageHelper {`
`270`	`270`	`const eventStartTime = Date.now().valueOf();`
`271`	`271`	`let counter = 1;`
`272`	`272`	`options.timeOutSeconds *= 1000;`
	`273`	`+ let pathActualImageCounter = resolvePath(this._args.reportsPath, imageName.replace(".", "_actual."));`
	`274`	`+ const shouldLogEveryImage = checkImageLogType(this._args.testReporter, LogImageType.everyImage);`
`273`	`275`	`while ((Date.now().valueOf() - eventStartTime) <= options.timeOutSeconds && !result) {`
`274`		`- const pathActualImageCounter = resolvePath(this._args.reportsPath, imageName.replace(".", "_actual_" + counter + "."));`
	`276`	`+ if (shouldLogEveryImage) {`
	`277`	`+ pathActualImageCounter = resolvePath(this._args.reportsPath, imageName.replace(".", "_actual_" + counter + "."));`
	`278`	`+ }`
`275`	`279`	`pathActualImage = await this._driver.saveScreenshot(pathActualImageCounter);`
`276`	`280`	`if (!options.keepOriginalImageSize) {`
`277`	`281`	`await this.clipRectangleImage(options.cropRectangle, pathActualImage);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 21cdc41

File tree

2 files changed

2 files changed

`‎lib/device-manager.ts‎`

`‎lib/image-helper.ts‎`

0 commit comments