From f5453ef4de127a81a1e1e6e0031dfc0de00a6234 Mon Sep 17 00:00:00 2001
From: SvetoslavTsenov <tsenov.svetoslav@gmail.com>
Date: Mon, 8 Jul 2019 14:50:18 +0300
Subject: [PATCH] chore: update imageHelper prop

---
 .../app/bottom-navigation/bottom-navigation-css-page.xml   | 5 -----
 .../bottom-navigation/bottom-navigation-base-page.ts       | 2 ++
 .../bottom-navigation-css-properties.e2e-spec.ts           | 7 -------
 .../bottom-navigation/bottom-navigation.e2e-spec.ts        | 1 -
 .../suites/tab-navigation/tab-view/tab-view-base-page.ts   | 2 ++
 .../tab-view/tab-view-common-tests.e2e-spec.ts             | 1 -
 .../tab-view/tab-view-css-properties.e2e-spec.ts           | 2 --
 e2e/ui-tests-app/package.json                              | 2 +-
 8 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-css-page.xml b/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-css-page.xml
index f06b6a735..ae33a63ec 100644
--- a/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-css-page.xml
+++ b/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-css-page.xml
@@ -10,15 +10,10 @@
       <GridLayout>
           <ScrollView>
             <StackLayout>
-              <Button text="tab-text-color: green;" tap="applyTap" tag="tab-text-color: green;" style.fontSize="8"/>
-              <Button text="tab-background-color: yellow;" tap="applyTap" tag="tab-background-color: yellow;" style.fontSize="8"/>
-              <Button text="selected-tab-text-color: red;" tap="applyTap" tag="selected-tab-text-color: red;" style.fontSize="8"/>
-              <Button text="android-selected-tab-highlight-color: orange;" tap="applyTap" tag="android-selected-tab-highlight-color: orange;" style.fontSize="8"/>
               <Button text="text-transform: uppercase;" tap="applyTap" tag="text-transform: uppercase;" style.fontSize="8"/>
               <Button text="text-transform: lowercase;" tap="applyTap" tag="text-transform: lowercase;" style.fontSize="8"/>
               <Button text="text-transform: capitalize;" tap="applyTap" tag="text-transform: capitalize;" style.fontSize="8"/>
               <Button text="text-transform: none;" tap="applyTap" tag="text-transform: none;" style.fontSize="8"/>
-              <Button text="all" tap="applyTap" tag="tab-text-color: green; tab-background-color: yellow; selected-tab-text-color: red; android-selected-tab-highlight-color: orange; text-transform: uppercase;" style.fontSize="8"/>
               <Button text="reset" tap="resetTap" style.fontSize="8"/>
             </StackLayout>
           </ScrollView>
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts
index f3b508848..753dc16a4 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts
@@ -9,6 +9,8 @@ export class BottomNavigationBasePage extends PageObjectBaseModel {
 
     constructor(_driver: AppiumDriver, elementCacheStrategy?: ElementCacheStrategy) {
         super(_driver, ["bottom-navigation"], elementCacheStrategy);
+        this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = 4000;
+        this._driver.imageHelper.options.keepOriginalImageSize = false;
     }
 
     async init(subSuiteName: string) {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
index e9a630053..5225a6783 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
@@ -14,15 +14,10 @@ describe(`${suite}-${spec}-suite`, async function () {
     let bottomNavigationBasePage: BottomNavigationBasePage;
 
     const samples = [
-        { sample: "tab-text-color: green;", tab1: "IteM onE", tab2: "IteM twO" },
-        { sample: "tab-background-color: yellow;", tab1: "IteM onE", tab2: "IteM twO" },
-        { sample: "selected-tab-text-color: red;", tab1: "IteM onE", tab2: "IteM twO" },
-        { sample: "android-selected-tab-highlight-color: orange;", tab1: "IteM onE", tab2: "IteM twO" },
         { sample: "text-transform: uppercase;", tab1: "IteM onE", tab2: "IteM twO" },
         { sample: "text-transform: lowercase;", tab1: "IteM onE", tab2: "IteM twO" },
         { sample: "text-transform: capitalize;", tab1: "IteM onE", tab2: "IteM twO" },
         { sample: "text-transform: none;", tab1: "IteM onE", tab2: "IteM twO" },
-        { sample: "all", tab1: "IteM onE", tab2: "IteM twO" },
         { sample: "reset", tab1: "IteM onE", tab2: "IteM twO" },
     ];
 
@@ -32,8 +27,6 @@ describe(`${suite}-${spec}-suite`, async function () {
         await driver.restartApp();
         bottomNavigationBasePage = new BottomNavigationBasePage(driver, ElementCacheStrategy.none);
         await bottomNavigationBasePage.init("css-text-transform");
-        driver.imageHelper.options.keepOriginalImageSize = false;
-        driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
     });
 
     after(async function () {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts
index 122cace97..2be9debb9 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts
@@ -17,7 +17,6 @@ describe(`${suite}-${spec}-suite`, async function () {
         await driver.restartApp();
         bottomNavigationBasePage = new BottomNavigationBasePage(driver);
         await bottomNavigationBasePage.initSuite();
-        driver.imageHelper.blockOutAreas = [{ x: 40, y: 0, height: 150, width: 325 }];
     });
 
     after(async function () {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts
index a04e249c7..bc1a0ebf5 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts
@@ -11,5 +11,7 @@ export class TabViewBasePage extends PageObjectBaseModel {
     async init(subSuiteName: string) {
         this._naviagtionLinks.push(subSuiteName);
         await super.initSuite();
+        this._driver.imageHelper.options.keepOriginalImageSize = false;
+        this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = 4000;
     }
 }
\ No newline at end of file
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-common-tests.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-common-tests.e2e-spec.ts
index a827e2779..b0cff1087 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-common-tests.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-common-tests.e2e-spec.ts
@@ -18,7 +18,6 @@ describe(`${suite}-${spec}-suite`, async function () {
         await driver.restartApp();
         tabViewBasePage = new TabViewBasePage(driver, ElementCacheStrategy.onload);
         await tabViewBasePage.initSuite();
-        driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
     });
 
     after(async function () {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts
index aa0329b69..9c3530a04 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts
@@ -32,8 +32,6 @@ describe(`${suite}-${spec}-suite`, async function () {
         await driver.restartApp();
         tabViewBasePage = new TabViewBasePage(driver, ElementCacheStrategy.none);
         await tabViewBasePage.init("tabViewCss");
-        driver.imageHelper.options.keepOriginalImageSize = false;
-        driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
     });
 
     after(async function () {
diff --git a/e2e/ui-tests-app/package.json b/e2e/ui-tests-app/package.json
index d64e97ef8..40c476fbb 100644
--- a/e2e/ui-tests-app/package.json
+++ b/e2e/ui-tests-app/package.json
@@ -5,7 +5,7 @@
       "version": "6.0.0-2019-07-05-092721-01"
     },
     "tns-ios": {
-      "version": "next"
+      "version": "6.0.0-2019-07-03-115841-01"
     }
   },
   "main": "app.js",