Merge pull request #252 from NativeScript/svetoslavtsenov/fix-rectangles

SvetoslavTsenov · web-flow · commit 0d832c4e21fb · 2019-09-04T23:06:02.000+03:00
fix: deep clone of cropRect from options
diff --git a/lib/appium-driver.d.ts b/lib/appium-driver.d.ts
@@ -1,4 +1,3 @@
-export declare const should: any;
 import { ElementHelper } from "./element-helper";
 import { SearchOptions } from "./search-options";
 import { UIElement } from "./ui-element";
diff --git a/lib/appium-driver.ts b/lib/appium-driver.ts
@@ -1,10 +1,5 @@
 import * as wd from "wd";
 import * as webdriverio from "webdriverio";
-const chai = require("chai");
-const chaiAsPromised = require("chai-as-promised");
-chai.use(chaiAsPromised);
-export const should = chai.should();
-chaiAsPromised.transferPromiseness = wd.transferPromiseness;
 
 import { ElementHelper } from "./element-helper";
 import { SearchOptions } from "./search-options";
diff --git a/lib/image-helper.d.ts b/lib/image-helper.d.ts
@@ -17,8 +17,8 @@ export interface IImageCompareOptions {
     */
     toleranceType?: ImageOptions;
     /**
-     * Wait miliseconds before capture creating image
-     * Default value is 2000
+     * Wait milliseconds before capture creating image
+     * Default value is 5000
      */
     waitBeforeCreatingInitialImageCapture?: number;
     /**
@@ -43,14 +43,14 @@ export interface IImageCompareOptions {
     keepOriginalImageSize?: boolean;
     /**
      * Default value is set to false. nativescript-dev-appium will recalculate view port for iOS
-     * so that the top/y will start from the end of status bar
+     * so that the top/y will start from the end of the status bar
      * So far appium calculates it even more and some part of safe areas are missed
      */
     keepAppiumViewportRect?: boolean;
     /**
-     * Defines if an image is device specific or only by platform.
-     * Default value is true and the image will be saved in device specific directory.
-     * If value is set to false, image will be saved under ios or android folder.
+     * Defines if an image is device-specific or only by the platform.
+     * Default value is true and the image will be saved in device-specific directory.
+     * If the value is set to false, the image will be saved under ios or android folder.
      */
     isDeviceSpecific?: boolean;
     /**
diff --git a/lib/image-helper.ts b/lib/image-helper.ts
@@ -29,8 +29,8 @@ export interface IImageCompareOptions {
     toleranceType?: ImageOptions;
 
     /**
-     * Wait miliseconds before capture creating image
-     * Default value is 2000
+     * Wait milliseconds before capture creating image
+     * Default value is 5000
      */
     waitBeforeCreatingInitialImageCapture?: number;
 
@@ -53,23 +53,23 @@ export interface IImageCompareOptions {
 
     /**
      * Default value is set to true which means that nativescript-dev-appium will save the image
-     * in original size and compare only the part which cropRectangle specifies. 
+     * in original size and compare only the part which cropRectangle specifies.
      * If false, the image size will be reduced and saved by the dimensions of cropRectangle.
      */
     keepOriginalImageSize?: boolean;
 
 
     /**
      * Default value is set to false. nativescript-dev-appium will recalculate view port for iOS
-     * so that the top/y will start from the end of status bar
+     * so that the top/y will start from the end of the status bar
      * So far appium calculates it even more and some part of safe areas are missed
      */
     keepAppiumViewportRect?: boolean;
 
     /**
-     * Defines if an image is device specific or only by platform.
-     * Default value is true and the image will be saved in device specific directory.
-     * If value is set to false, image will be saved under ios or android folder.
+     * Defines if an image is device-specific or only by the platform.
+     * Default value is true and the image will be saved in device-specific directory.
+     * If the value is set to false, the image will be saved under ios or android folder.
      */
     isDeviceSpecific?: boolean;
 
@@ -98,7 +98,9 @@ export class ImageHelper {
     };
 
     constructor(private _args: INsCapabilities, private _driver: AppiumDriver) {
-        this._defaultOptions.cropRectangle = (this._args.appiumCaps && this._args.appiumCaps.viewportRect) || this._args.device.viewportRect;
+        if (this._args.device.viewportRect) {
+            ImageHelper.fullClone(this._args.device.viewportRect, this._defaultOptions.cropRectangle)
+        }
         if (!this._defaultOptions.cropRectangle
             || !isNumber(this._defaultOptions.cropRectangle.y)) {
             this._defaultOptions.cropRectangle = this._defaultOptions.cropRectangle || {};
diff --git a/lib/parser.d.ts b/lib/parser.d.ts
@@ -1,2 +1,2 @@
 import { LogImageType } from "./enums/log-image-type";
-export declare const projectDir: string, projectBinary: string, pluginRoot: string, pluginBinary: string, port: number, verbose: boolean, appiumCapsLocation: string, testFolder: string, runType: string, isSauceLab: boolean, appPath: string, storage: string, testReports: string, devMode: boolean, ignoreDeviceController: boolean, wdaLocalPort: number, path: string, relaxedSecurity: boolean, cleanApp: boolean, attachToDebug: boolean, sessionId: string, startSession: boolean, capabilitiesName: string, imagesPath: string, startDeviceOptions: string, deviceTypeOrPlatform: string, device: import("mobile-devices-controller/lib/device").IDevice, driverConfig: any, logImageTypes: LogImageType[], appiumCaps: any;
+export declare const projectDir: string, projectBinary: string, pluginRoot: string, pluginBinary: string, port: number, verbose: boolean, appiumCapsLocation: string, testFolder: string, runType: string, isSauceLab: boolean, appPath: string, storage: string, testReports: string, devMode: boolean, ignoreDeviceController: boolean, wdaLocalPort: number, path: string, relaxedSecurity: boolean, cleanApp: boolean, attachToDebug: boolean, sessionId: string, startSession: boolean, capabilitiesName: string, imagesPath: string, startDeviceOptions: string, deviceTypeOrPlatform: string, device: any, driverConfig: any, logImageTypes: LogImageType[], appiumCaps: any;
diff --git a/lib/ui-element.ts b/lib/ui-element.ts
@@ -49,7 +49,7 @@ export class UIElement {
      * This method is not working very good with UiAutomator2
      * It is better to use click instead.
      */
-    
+
     public async tap() {
         if (this._args.automationName == AutomationName.UiAutomator2) {
             return await this.tapCenter();
@@ -242,16 +242,14 @@ export class UIElement {
      */
     public async getActualRectangle() {
         const actRect = await this.getRectangle();
-        if (this._args.isIOS) {
-            const density = this._args.device.config.density;
-            if (density) {
-                actRect.x *= density;
-                actRect.y *= density;
-                actRect.width *= density;
-                actRect.height *= density;
-            } else {
-                throw new Error("Device's density is undefined!");
-            }
+        const density = this._args.device.config.density;
+        if (density) {
+            actRect.x *= density;
+            actRect.y *= density;
+            actRect.width *= density;
+            actRect.height *= density;
+        } else {
+            throw new Error("Device's density is undefined!");
         }
         return actRect;
     }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-appium",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "A NativeScript plugin to help integrate and run Appium tests",
   "author": "NativeScript",
   "license": "MIT",
@@ -33,8 +33,6 @@
   "dependencies": {
     "app-root-path": "~2.1.0",
     "blink-diff": "~1.0.13",
-    "chai": "~4.2.0",
-    "chai-as-promised": "~7.1.0",
     "frame-comparer": "^2.0.1",
     "glob": "^7.1.0",
     "inquirer": "^6.2.0",
diff --git a/samples/e2e-ts/tsconfig.json b/samples/e2e-ts/tsconfig.json
@@ -5,6 +5,7 @@
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
         "importHelpers": false,
+        "sourceMap": true,
         "types": [ ],
         "lib": [
             "es2015",
diff --git a/samples/e2e-ts/typescript.mocha.sample.e2e-spec.mochawesome.ts b/samples/e2e-ts/typescript.mocha.sample.e2e-spec.mochawesome.ts
@@ -2,7 +2,7 @@ import { AppiumDriver, createDriver, SearchOptions, nsCapabilities } from "nativ
 import { assert } from "chai";
 const addContext = require('mochawesome/addContext');
 
-describe("sample scenario", () => {
+describe("sample scenario", async function(){
     let driver: AppiumDriver;
 
     before(async function(){

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-export declare const should: any;`
`2`	`1`	`import { ElementHelper } from "./element-helper";`
`3`	`2`	`import { SearchOptions } from "./search-options";`
`4`	`3`	`import { UIElement } from "./ui-element";`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`import { LogImageType } from "./enums/log-image-type";`
`2`		-export declare const projectDir: string, projectBinary: string, pluginRoot: string, pluginBinary: string, port: number, verbose: boolean, appiumCapsLocation: string, testFolder: string, runType: string, isSauceLab: boolean, appPath: string, storage: string, testReports: string, devMode: boolean, ignoreDeviceController: boolean, wdaLocalPort: number, path: string, relaxedSecurity: boolean, cleanApp: boolean, attachToDebug: boolean, sessionId: string, startSession: boolean, capabilitiesName: string, imagesPath: string, startDeviceOptions: string, deviceTypeOrPlatform: string, device: import("mobile-devices-controller/lib/device").IDevice, driverConfig: any, logImageTypes: LogImageType[], appiumCaps: any;
	`2`	+export declare const projectDir: string, projectBinary: string, pluginRoot: string, pluginBinary: string, port: number, verbose: boolean, appiumCapsLocation: string, testFolder: string, runType: string, isSauceLab: boolean, appPath: string, storage: string, testReports: string, devMode: boolean, ignoreDeviceController: boolean, wdaLocalPort: number, path: string, relaxedSecurity: boolean, cleanApp: boolean, attachToDebug: boolean, sessionId: string, startSession: boolean, capabilitiesName: string, imagesPath: string, startDeviceOptions: string, deviceTypeOrPlatform: string, device: any, driverConfig: any, logImageTypes: LogImageType[], appiumCaps: any;