Merge pull request #2011 from NativeScript/merge-master-in-release

Merge master in release

Author: DimitarTodorov

Diff for: e2e/animation-examples/e2e/resources/images/ng4animations/iPhone XR 12/add_active_items.png

@@ -200,5 +200,25 @@
         "deviceName": "iPhone XR",
         "noReset": true,
         "fullReset": false
+    },
+    "sim.iPhoneXR.ios12": {
+        "platformName": "iOS",
+        "platformVersion": "12.0",
+        "deviceName": "iPhone XR 12",
+        "noReset": true,
+        "fullReset": false
+    },
+    "sim.iPhoneXR.ios13": {
+        "platformName": "iOS",
+        "platformVersion": "13.0",
+        "deviceName": "iPhone XR 13",
+        "appiumVersion": "1.15.0",
+        "noReset": true,
+        "fullReset": false,
+        "density": 3,
+        "offsetPixels": 87,
+        "app": "",
+        "idleTimeout": 120,
+        "automationName": "Appium"
     }
 }

Diff for: e2e/animation-examples/e2e/resources/images/ng4animations/iPhone XR 12/add_inactive_items.png

@@ -7,6 +7,7 @@ import {
 } from "nativescript-dev-appium";
 import { assert } from "chai";
 import { isSauceLab } from "nativescript-dev-appium/lib/parser";
+import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 
 const QUEUE_WAIT_TIME: number = 600000; // Sometimes SauceLabs threads are not available and the tests wait in a queue to start. Wait 10 min before timeout.
 
@@ -49,23 +50,23 @@ describe("page-router-outlet-scenario", async function () {
         });
 
         it("should not hide action bar by default", async function () {
-            const screenMatches = await driver.compareScreen("actionBarVisibility-always-default", 5);
+            const screenMatches = await driver.compareScreen("actionBarVisibility-always-default", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
 
         it("should not hide action bar when hidden by page", async function () {
             const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar");
             await hideActionBarButton.click();
 
-            const screenMatches = await driver.compareScreen("actionBarVisibility-always-hidden", 5);
+            const screenMatches = await driver.compareScreen("actionBarVisibility-always-hidden", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
 
         it("should not do anything when shown action bar by page", async function () {
             const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar");
             await showActionBarButton.click();
 
-            const screenMatches = await driver.compareScreen("actionBarVisibility-always-shown", 5);
+            const screenMatches = await driver.compareScreen("actionBarVisibility-always-shown", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
     });
@@ -167,21 +168,21 @@ describe("page-router-outlet-scenario", async function () {
         });
 
         it("should show action bar by default", async function () {
-            const screenMatches = await driver.compareScreen("actionBarVisibility-auto-default", 5);
+            const screenMatches = await driver.compareScreen("actionBarVisibility-auto-default", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
 
         it("should hide action bar when hidden by page", async function () {
             const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar");
             await hideActionBarButton.click();
-            const screenMatches = await driver.compareScreen("actionBarVisibility-auto-hidden", 5);
+            const screenMatches = await driver.compareScreen("actionBarVisibility-auto-hidden", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
 
         it("should show action bar when shown by page", async function () {
             const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar");
             await showActionBarButton.click();
-            const screenMatches = await driver.compareScreen("actionBarVisibility-auto-shown", 5);
+            const screenMatches = await driver.compareScreen("actionBarVisibility-auto-shown", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
     });

Diff for: e2e/animation-examples/e2e/resources/images/ng4animations/iPhone XR 12/add_remove_items.png

@@ -7,6 +7,7 @@ import {
 } from "nativescript-dev-appium";
 import { assert } from "chai";
 import { isSauceLab } from "nativescript-dev-appium/lib/parser";
+import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 
 const QUEUE_WAIT_TIME: number = 600000; // Sometimes SauceLabs threads are not available and the tests wait in a queue to start. Wait 10 min before timeout.
 
@@ -58,7 +59,7 @@ describe("TabView-scenario", async function(){
             secondTabItem = notSelectedTabItems[0];
             thirdTabItem = notSelectedTabItems[1];
 
-            const screenMatches = await driver.compareScreen("tab-view-binding-first-tab", 5);
+            const screenMatches = await driver.compareScreen("tab-view-binding-first-tab", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
 
@@ -73,7 +74,7 @@ describe("TabView-scenario", async function(){
             secondTabItem = await driver.findElementByAutomationText("SELECTED");
             thirdTabItem = notSelectedTabItems[1];
 
-            const screenMatches = await driver.compareScreen("tab-view-binding-second-tab", 5);
+            const screenMatches = await driver.compareScreen("tab-view-binding-second-tab", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
 
@@ -88,7 +89,7 @@ describe("TabView-scenario", async function(){
             secondTabItem = notSelectedTabItems[1];
             thirdTabItem = await driver.findElementByAutomationText("SELECTED");
 
-            const screenMatches = await driver.compareScreen("tab-view-binding-third-tab", 5);
+            const screenMatches = await driver.compareScreen("tab-view-binding-third-tab", 5, 50, ImageOptions.pixel);
             assert(screenMatches);
         });
     });

Diff for: e2e/animation-examples/e2e/resources/images/ng4animations/iPhone XR 12/add_reset_items.png

@@ -31,6 +31,7 @@
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
+    "chai": "^4.2.0",
     "lazy": "1.0.11",
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",

Diff for: e2e/animation-examples/e2e/resources/images/ng4animations/iPhone XR 13/add_active_items.png

@@ -1,6 +1,7 @@
 import { AppiumDriver, createDriver, SearchOptions, nsCapabilities } from "nativescript-dev-appium";
 import { assert } from "chai";
 import { isSauceLab } from "nativescript-dev-appium/lib/parser";
+import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 
 const QUEUE_WAIT_TIME: number = 600000; // Sometimes SauceLabs threads are not available and the tests wait in a queue to start. Wait 10 min before timeout.
 
@@ -32,7 +33,7 @@ describe("sample scenario", function () {
 
     it("should go to support page", async function () {
         const btnGoToSupportPage = await driver.findElementByAutomationText("go to support page");
-        const homeImage = await driver.compareScreen("home");
+        const homeImage = await driver.compareScreen("home", 5, 20, ImageOptions.pixel);
         assert.isTrue(homeImage);
         await btnGoToSupportPage.click();
         const titleSupportPage = await driver.findElementByAutomationText("Support Page");
@@ -41,7 +42,7 @@ describe("sample scenario", function () {
 
     it("should go back to home page", async function () {
         const btnGoBackToHomePage = await driver.findElementByAutomationText("go back to home page");
-        const supportImage = await driver.compareScreen("support");
+        const supportImage = await driver.compareScreen("support", 5, 20, ImageOptions.pixel);
         assert.isTrue(supportImage);
         await btnGoBackToHomePage.click();
         const titleHomePage = await driver.findElementByAutomationText("Home Page");