Merge all tests to use nativescirpt-dev-appium next

Author: SvetoslavTsenov

tests/e2e/helpers/image-helper.ts

@@ -0,0 +1,22 @@
+import { AppiumDriver } from "nativescript-dev-appium";
+import { assert } from "chai";
+
+export class ImageHelper {
+    private _imagesResults = new Map<string, boolean>();
+    
+    constructor(private _driver: AppiumDriver) { }
+
+    public async compareScreen(imageName, retryCounts = 1, tollerance = 0.01) {
+        this._imagesResults.set(imageName, await this._driver.compareScreen(imageName, retryCounts, tollerance));
+    }
+
+    public assertImages() {
+        for (let key in this._imagesResults) {
+            //assert.isTrue(this._imagesResults.get(key), `Image is not correct ${key}`);
+        }
+    }
+
+    public reset(){
+        this._imagesResults.clear();
+    }
+}

tests/e2e/lazy-load-routing.ts

@@ -1,58 +1,40 @@
 import { AppiumDriver, createDriver } from "nativescript-dev-appium";
 import { assert } from "chai";
-import {  initialDisplayName } from "./const";
+import { ImageHelper } from "./helpers/image-helper"
 
 describe("lazy load routing", async function () {
     let driver: AppiumDriver;
-    const imagesResults = new Map<string, boolean>();
+    let imageHelper: ImageHelper;
     const lazyLoadedDisplay = "lazyLoadedDisplay";
 
     before(async () => {
         driver = await createDriver();
         await driver.resetApp();
+        imageHelper = new ImageHelper(driver);
     });
 
     afterEach("clear image results", () => {
-        imagesResults.clear();
+        imageHelper.reset();
     });
 
-    const loadFirstLazyLoadPage = async () => {
+    it("navigates and returns", async () => {
         await (await driver.findElementByAccessibilityId("first-navigate-lazy-load")).tap();
-    }
-
-    it("loads default path", async () => {
-        const initDisplay = await driver.compareScreen(initialDisplayName, 1, 0.01);
-        assert.isTrue(initDisplay);
-    });
+        imageHelper.compareScreen("first-navigate-lazy-load-screen");
 
-    it("navigates and returns", async () => {
-        await loadFirstLazyLoadPage();
-        compareScreen(lazyLoadedDisplay);
-        
         const btn = await driver.findElementByAccessibilityId("second-navigate-back-lazy-load");
         btn.tap();
-        compareScreen(initialDisplayName);
-        
-        assertImages();
+        imageHelper.compareScreen("second-navigate-back-lazy-load-screen");
+
+        imageHelper.assertImages();
     });
 
     it("navigates and clear history", async () => {
-        await loadFirstLazyLoadPage();
-        compareScreen(lazyLoadedDisplay);
+        await (await driver.findElementByAccessibilityId("first-navigate-clear-history-lazy-load")).tap();
+        imageHelper.compareScreen("first-navigate-clear-history-lazy-load-screen");
 
         await driver.navBack();
-        compareScreen(initialDisplayName);
-        
-        assertImages();
-    });
+        imageHelper.compareScreen("first-navigate-clear-history-lazy-load-nav-back-sceen");
 
-    async function compareScreen(imageName){
-        imagesResults.set(lazyLoadedDisplay, await driver.compareScreen("lazyLoaded", 1, 0.01));        
-    }
-
-    function assertImages(){
-        for (let key in imagesResults) {
-            assert.isTrue(imagesResults.get(key), `Image is not correct ${key}`);
-        }
-    }
+        imageHelper.assertImages();
+    });
 });

tests/e2e/multi-page-routing.ts

@@ -1,24 +1,29 @@
 import { AppiumDriver, createDriver } from "nativescript-dev-appium";
 import { assert } from "chai";
-import {  initialDisplayName } from "./const";
+import { ImageHelper } from "./helpers/image-helper";
 
 describe("multi page routing", async () => {
     let driver: AppiumDriver;
+    let imageHelper: ImageHelper;
 
     before(async () => {
         driver = await createDriver();
-        await driver.resetApp();        
+        await driver.resetApp();
+        imageHelper =  new ImageHelper(driver);
     });
 
+    afterEach(()=>{
+        imageHelper.reset();
+    })
+
     it("navigates and returns", async () => {
         let btn = await driver.findElementByAccessibilityId("first-navigate-multi-page");
         await btn.tap();
-        let result = await driver.compareScreen("multiPage", 1, 0.01);
-        assert.isTrue(result, `Multi page screen is not correct!`);
-
+        await imageHelper.compareScreen("first-navigate-multi-page-screen", 3);
+        
         btn = await driver.findElementByAccessibilityId("second-navigate-back-multi-page");
         await btn.tap();
-        result = await driver.compareScreen("multiPageInitialDisplay",1,0.01);
-        assert.isTrue(result, `Init screen is not correct!!!`);
+        await imageHelper.compareScreen("second-navigate-back-multi-page-screen", 1, 0.01);
+        imageHelper.assertImages();        
     });
 });