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

Merge master in release

Author: elena-p

README.md

@@ -24,10 +24,10 @@ This repository contains the code for integration of NativeScript with Angular.
 
 The `ng-sample` app is meant for testing stuff while developing the renderer code, and isn't the best example out there. You can take a look at these sample apps that use the published builds from npm:
 
-* [Hello world starter](https://github.com/NativeScript/template-hello-world-ng)
-* [Master-detail template](https://github.com/NativeScript/template-master-detail-ng)
-* [Drawer navigation template](https://github.com/NativeScript/template-drawer-navigation-ng)
-* [TabView navigation template](https://github.com/NativeScript/template-tab-navigation-ng)
+* [Hello world starter](https://github.com/NativeScript/nativescript-app-templates/tree/master/packages/template-hello-world-ng)
+* [Master-detail template](https://github.com/NativeScript/nativescript-app-templates/tree/master/packages/template-master-detail-ng)
+* [Drawer navigation template](https://github.com/NativeScript/nativescript-app-templates/tree/master/packages/template-drawer-navigation-ng)
+* [TabView navigation template](https://github.com/NativeScript/nativescript-app-templates/tree/master/packages/template-tab-navigation-ng)
 * [NativeScript Angular SDK examples](https://github.com/NativeScript/nativescript-sdk-examples-ng)
 
 ## Contribute

e2e/animation-examples/app/package.json

@@ -1,5 +1,9 @@
 {
   "main": "main.js",
   "name": "nativescript-template-ng-tutorial",
-  "version": "3.1.0"
+  "version": "3.1.0",
+  "android": {
+    "v8Flags": "--expose_gc",
+    "markingMode": "none"
+  }
 }

e2e/animation-examples/e2e/smoke.e2e-spec.ts

@@ -9,15 +9,30 @@ import { AnimationWithOptionsPage } from "./pages/animation-with-options-page";
 import { AnimationsWithDefaultOptionsPage } from "./pages/animations-with-default-options-page";
 import { AnimateChildPage } from "./pages/animate-child-page";
 import { HeroPage } from "./pages/hero-page";
+import { isSauceLab } from "nativescript-dev-appium/lib/parser";
+
+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.
+const isSauceRun = isSauceLab;
 
 describe("smoke-tests", async function () {
     let driver: AppiumDriver;
 
     before(async function () {
+        this.timeout(QUEUE_WAIT_TIME);
         nsCapabilities.testReporter.context = this;
         driver = await createDriver();
     });
 
+    after(async function () {
+        if (isSauceRun) {
+            driver.sessionId().then(function (sessionId) {
+                console.log("Report https://saucelabs.com/beta/tests/" + sessionId);
+            });
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
     afterEach(async function () {
         if (this.currentTest.state === "failed") {
             await driver.logTestArtifacts(this.currentTest.title);

e2e/animation-examples/package.json

@@ -42,7 +42,7 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-css-loader": "~0.26.0",
-    "nativescript-dev-appium": "next",
+    "nativescript-dev-appium": "^6.0.0",
     "nativescript-dev-webpack": "next",
     "typescript": "~3.5.3"
   },

e2e/modal-navigation-ng/app/package.json

@@ -1,6 +1,7 @@
 {
   "android": {
-    "v8Flags": "--expose_gc"
+    "v8Flags": "--expose_gc",
+    "markingMode": "none"
   },
   "main": "main.js",
   "name": "tns-template-hello-world-ng",

e2e/modal-navigation-ng/e2e/modal-frame.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { AppiumDriver, createDriver, nsCapabilities } from "nativescript-dev-appium";
-import { Screen } from "./screens/screen"
+import { Screen } from "./screens/screen";
 import {
     roots,
     modalFrameBackground,
@@ -8,19 +8,34 @@ import {
     testNestedModalFrameBackground,
     testNestedModalPageBackground,
     testDialogBackground
-} from "./screens/shared-screen"
+} from "./screens/shared-screen";
+import { isSauceLab } from "nativescript-dev-appium/lib/parser";
+
+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.
+const isSauceRun = isSauceLab;
 
 describe("modal-frame:", async function () {
 
     let driver: AppiumDriver;
     let screen: Screen;
 
     before(async function () {
+        this.timeout(QUEUE_WAIT_TIME);
         nsCapabilities.testReporter.context = this;
         driver = await createDriver();
         screen = new Screen(driver);
     });
 
+    after(async function () {
+        if (isSauceRun) {
+            driver.sessionId().then(function (sessionId) {
+                console.log("Report https://saucelabs.com/beta/tests/" + sessionId);
+            });
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
     for (let index = 0; index < roots.length; index++) {
         const root = roots[index];
         describe(`${root} modal frame background scenarios:`, async function () {
@@ -30,9 +45,6 @@ describe("modal-frame:", async function () {
                 await screen[root]();
             });
 
-            beforeEach(async function () {
-            });
-
             afterEach(async function () {
                 if (this.currentTest.state === "failed") {
                     await driver.logTestArtifacts(this.currentTest.title);

e2e/modal-navigation-ng/e2e/modal-layout.e2e-spec.ts

@@ -4,17 +4,33 @@ import {
     roots,
     testNestedModalPageBackground,
     testDialogBackground,
-} from "./screens/shared-screen"
+} from "./screens/shared-screen";
+import { isSauceLab } from "nativescript-dev-appium/lib/parser";
+
+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.
+const isSauceRun = isSauceLab;
 
 describe("modal-layout:", async function () {
     let driver: AppiumDriver;
     let screen: Screen;
 
     before(async function () {
+        this.timeout(QUEUE_WAIT_TIME);
         nsCapabilities.testReporter.context = this;
         driver = await createDriver();
         screen = new Screen(driver);
     });
+
+    after(async function () {
+        if (isSauceRun) {
+            driver.sessionId().then(function (sessionId) {
+                console.log("Report https://saucelabs.com/beta/tests/" + sessionId);
+            });
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
     for (let index = 0; index < roots.length; index++) {
         const root = roots[index];
         describe(`${root} modal no frame background scenarios:`, async function () {