diff --git a/CHANGELOG.md b/CHANGELOG.md index 519cfee07..03ba56a3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [8.2.1](https://github.com/NativeScript/nativescript-angular/compare/8.2.0...8.2.1) (2019-08-28) + + +### Bug Fixes + +* **hmr:** close modal views during livesync [#7669](https://github.com/NativeScript/nativescript-angular/issues/7669) ([#1944](https://github.com/NativeScript/nativescript-angular/issues/1944)) ([73d83ed](https://github.com/NativeScript/nativescript-angular/commit/73d83ed)) + + + # [8.2.0](https://github.com/NativeScript/nativescript-angular/compare/8.1.0...8.2.0) (2019-08-13) diff --git a/e2e/animation-examples/e2e/pages/animation-with-options-page.ts b/e2e/animation-examples/e2e/pages/animation-with-options-page.ts index e360e38b4..131ac8599 100644 --- a/e2e/animation-examples/e2e/pages/animation-with-options-page.ts +++ b/e2e/animation-examples/e2e/pages/animation-with-options-page.ts @@ -12,30 +12,33 @@ export class AnimationWithOptionsPage extends BasePage { async enterExample() { const exampleBtn = await this._driver.findElementByAccessibilityId("options"); await exampleBtn.click(); - this.initialPositionOfAnimatedBtn = await (await this.animatedBtn).location(); + const animatedBtn = await this.animatedBtn(); + this.initialPositionOfAnimatedBtn = await animatedBtn.location(); } - get btnToggleAnimation() { - return this._driver.findElementByAccessibilityId("toggleAnimation"); + async btnToggleAnimation() { + return await this._driver.findElementByAccessibilityId("toggleAnimation"); } - get animatedBtn() { - this._driver.findElementsByAccessibilityId("animatedBtn", 10000); - return this._driver.findElementByAccessibilityIdIfExists("animatedBtn"); + async animatedBtn() { + await this._driver.wait(2000); + const btn = await this._driver.findElementByAccessibilityIdIfExists("animatedBtn"); + return btn; } async toggleAnimation() { - const btnTapToDisappear = await this.btnToggleAnimation; + const btnTapToDisappear = await this.btnToggleAnimation(); await btnTapToDisappear.click(); } async waitElementToHide() { - return this.waitElementTo(() => this.animatedBtn, false, 10000); + await this._driver.wait(2000); + return await this._driver.findElementByAccessibilityIdIfExists("animatedBtn"); } async assertPositionOfToggleAnimationBtn() { - this.waitElementTo(() => this.btnToggleAnimation, true, 5000); - const point: Point = await (await this.btnToggleAnimation).location(); + await this.waitElementTo(() => this.btnToggleAnimation(), true, 5000); + const point: Point = await (await this.btnToggleAnimation()).location(); assert.isTrue(point.y === this.initialPositionOfAnimatedBtn.y); } } \ No newline at end of file diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_active_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_active_items.png deleted file mode 100644 index f86544cd8..000000000 Binary files a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_active_items.png and /dev/null differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_inactive_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_inactive_items.png deleted file mode 100644 index 4bea5e8ef..000000000 Binary files a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_inactive_items.png and /dev/null differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_remove_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_remove_items.png deleted file mode 100644 index f5afdfa80..000000000 Binary files a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_remove_items.png and /dev/null differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_reset_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_reset_items.png deleted file mode 100644 index a3976e322..000000000 Binary files a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_reset_items.png and /dev/null differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_active_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_active_items.png new file mode 100644 index 000000000..16a366e55 Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_active_items.png differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_inactive_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_inactive_items.png new file mode 100644 index 000000000..c2b6ae485 Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_inactive_items.png differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_remove_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_remove_items.png new file mode 100644 index 000000000..8f43603c6 Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_remove_items.png differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_reset_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_reset_items.png new file mode 100644 index 000000000..0efdf2fdf Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api22-Google/add_reset_items.png differ diff --git a/e2e/animation-examples/e2e/smoke.e2e-spec.ts b/e2e/animation-examples/e2e/smoke.e2e-spec.ts index a325a73e1..199480a95 100644 --- a/e2e/animation-examples/e2e/smoke.e2e-spec.ts +++ b/e2e/animation-examples/e2e/smoke.e2e-spec.ts @@ -87,7 +87,7 @@ describe("smoke-tests", async function () { await animationWithOptionsPage.enterExample(); await animationWithOptionsPage.toggleAnimation(); const result = await animationWithOptionsPage.waitElementToHide(); - assert.isFalse(result.isVisible, "The button should disappear!"); + assert.isUndefined(result, "The button should disappear!"); await animationWithOptionsPage.assertPositionOfToggleAnimationBtn(); }); diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index 8a6bbc7bc..088616b84 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -41,7 +41,7 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-css-loader": "~0.26.0", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", "nativescript-dev-webpack": "next", "typescript": "~3.5.3" }, diff --git a/e2e/animation-examples/tsconfig.json b/e2e/animation-examples/tsconfig.json index a4ddb2d04..d93d819b4 100644 --- a/e2e/animation-examples/tsconfig.json +++ b/e2e/animation-examples/tsconfig.json @@ -22,9 +22,16 @@ ] } }, + "include": [ + "../../nativescript-angular", + "**/*" + ], "exclude": [ + "../../nativescript-angular/node_modules", + "../../nativescript-angular/**/*.d.ts", "node_modules", "platforms", + "**/*.aot", "e2e" ] } \ No newline at end of file diff --git a/e2e/config/appium.capabilities.json b/e2e/config/appium.capabilities.json index 6c4b96c77..29f17cc5f 100644 --- a/e2e/config/appium.capabilities.json +++ b/e2e/config/appium.capabilities.json @@ -45,6 +45,21 @@ "noReset": false, "fullReset": false }, + "android22.sauce": { + "platformName": "Android", + "platformVersion": "5.1", + "deviceName": "Android GoogleAPI Emulator", + "lt": 60000, + "newCommandTimeout": 720, + "appiumVersion": "1.13.0", + "noReset": true, + "fullReset": false, + "app": "", + "idleTimeout": 120, + "automationName": "Appium", + "density":3.2, + "offsetPixels":51 + }, "android23": { "platformName": "Android", "platformVersion": "6.0", diff --git a/e2e/config/mocha.opts b/e2e/config/mocha.opts index 719c7e05a..92a64e8fe 100644 --- a/e2e/config/mocha.opts +++ b/e2e/config/mocha.opts @@ -1,5 +1,5 @@ ---timeout 60000 +--timeout 120000 --recursive e2e --reporter mochawesome ---reporter-options quiet=true,html=true,inline=true,autoOpen=true +--reporter-options quiet=true,html=true,inline=true --exit \ No newline at end of file diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 90ed2666d..fc6d57e7f 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -40,7 +40,7 @@ "lazy": "1.0.11", "mocha": "~5.2.0", "mochawesome": "~3.1.2", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", "nativescript-dev-webpack": "next", "tns-platform-declarations": "next", "typescript": "~3.5.3" diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index 89fd27d65..22cf2c490 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -34,7 +34,7 @@ "lazy": "1.0.11", "mocha": "~5.2.0", "mochawesome": "~3.1.2", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", "nativescript-dev-webpack": "next", "typescript": "~3.5.3" }, diff --git a/e2e/renderer/.vscode/launch.json b/e2e/renderer/.vscode/launch.json index cd10b18ce..57e3caf4c 100644 --- a/e2e/renderer/.vscode/launch.json +++ b/e2e/renderer/.vscode/launch.json @@ -12,10 +12,11 @@ "--timeout", "999999", "--colors", - "--reuseDevice", - "--runType", - "sim.iPhone7.iOS110", - "${workspaceRoot}/e2e" + "${workspaceRoot}/e2e", + "-a", + "--grep", + "actionBarVisibility 'auto' shows action bars based on page" + ], "internalConsoleOptions": "openOnSessionStart" } diff --git a/e2e/renderer/e2e/ngfor.e2e-spec.ts b/e2e/renderer/e2e/ngfor.e2e-spec.ts index 1b9fb1331..e51c467b4 100644 --- a/e2e/renderer/e2e/ngfor.e2e-spec.ts +++ b/e2e/renderer/e2e/ngfor.e2e-spec.ts @@ -53,7 +53,7 @@ describe("ngFor scenario", async function () { }); it("should place new elements in the right places", async function () { - for (let i = 0; i < 5; i += 1) { + for (let i = 0; i < 3; i += 1) { await addElement(); await checkAppendedCorrectly(); } @@ -67,7 +67,7 @@ describe("ngFor scenario", async function () { }); it("should render new elements correctly after all old ones are removed", async function () { - for (let i = 0; i < 5; i += 1) { + for (let i = 0; i < 3; i += 1) { await addElement(); await checkCorrectOrderAll(); } diff --git a/e2e/renderer/e2e/ngforof.e2e-spec.ts b/e2e/renderer/e2e/ngforof.e2e-spec.ts index 5b272ff9d..57b844d62 100644 --- a/e2e/renderer/e2e/ngforof.e2e-spec.ts +++ b/e2e/renderer/e2e/ngforof.e2e-spec.ts @@ -75,7 +75,7 @@ describe("ngForOf scenario", function () { }); it("should render new elements correctly after all old ones are removed", async function () { - for (let i = 0; i < 5; i += 1) { + for (let i = 0; i < 3; i += 1) { await addElement(); await checkCorrectOrderAll(); } diff --git a/e2e/renderer/e2e/page-router-outlet.e2e-spec.ts b/e2e/renderer/e2e/page-router-outlet.e2e-spec.ts index fb1ef8a84..c904603c7 100644 --- a/e2e/renderer/e2e/page-router-outlet.e2e-spec.ts +++ b/e2e/renderer/e2e/page-router-outlet.e2e-spec.ts @@ -38,7 +38,7 @@ describe("page-router-outlet-scenario", async function () { it("should not hide action bar when hidden by page", async function () { const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar"); - hideActionBarButton.click(); + await hideActionBarButton.click(); const screenMatches = await driver.compareScreen("actionBarVisibility-always-hidden", 5); assert(screenMatches); @@ -46,7 +46,7 @@ describe("page-router-outlet-scenario", async function () { it("should not do anything when shown action bar by page", async function () { const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar"); - showActionBarButton.click(); + await showActionBarButton.click(); const screenMatches = await driver.compareScreen("actionBarVisibility-always-shown", 5); assert(screenMatches); @@ -81,7 +81,7 @@ describe("page-router-outlet-scenario", async function () { it("should not show action bar when shown by page", async function () { const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar"); - showActionBarButton.click(); + await showActionBarButton.click(); const screenMatches = await driver.compareScreen("actionBarVisibility-never-shown", 5); assert(screenMatches); @@ -89,7 +89,7 @@ describe("page-router-outlet-scenario", async function () { it("should not do anything when hidden action bar by page", async function () { const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar"); - hideActionBarButton.click(); + await hideActionBarButton.click(); const screenMatches = await driver.compareScreen("actionBarVisibility-never-hidden", 5); assert(screenMatches); @@ -128,7 +128,7 @@ describe("page-router-outlet-scenario", async function () { it("should not show action bar when shown by page", async function () { const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar"); - showActionBarButton.click(); + await showActionBarButton.click(); const screenMatches = await driver.compareScreen(`actionBarVisibility-never-shown${imagePostFix}`, 5); assert(screenMatches); @@ -136,7 +136,7 @@ describe("page-router-outlet-scenario", async function () { it("should not do anything when hidden action bar by page", async function () { const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar"); - hideActionBarButton.click(); + await hideActionBarButton.click(); const screenMatches = await driver.compareScreen(`actionBarVisibility-never-hidden${imagePostFix}`, 5); assert(screenMatches); @@ -171,16 +171,14 @@ describe("page-router-outlet-scenario", async function () { it("should hide action bar when hidden by page", async function () { const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar"); - hideActionBarButton.click(); - + await hideActionBarButton.click(); const screenMatches = await driver.compareScreen("actionBarVisibility-auto-hidden", 5); assert(screenMatches); }); it("should show action bar when shown by page", async function () { const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar"); - showActionBarButton.click(); - + await showActionBarButton.click(); const screenMatches = await driver.compareScreen("actionBarVisibility-auto-shown", 5); assert(screenMatches); }); diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-default.png deleted file mode 100644 index 9cd345ecc..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-default.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-hidden.png deleted file mode 100644 index 9cd345ecc..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-hidden.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-shown.png deleted file mode 100644 index e017d9953..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-always-shown.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-default.png deleted file mode 100644 index edf61335c..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-default.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-hidden.png deleted file mode 100644 index edf61335c..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-hidden.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-shown.png deleted file mode 100644 index 445b7c3ed..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-auto-shown.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-default.png deleted file mode 100644 index a2518a90d..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-default.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-hidden.png deleted file mode 100644 index 3e918bcfe..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-hidden.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-shown.png deleted file mode 100644 index a2518a90d..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/actionBarVisibility-never-shown.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-first-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-first-tab.png deleted file mode 100644 index 87ffb5fcc..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-first-tab.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-second-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-second-tab.png deleted file mode 100644 index 46636cc03..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-second-tab.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-third-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-third-tab.png deleted file mode 100644 index 37cdd55e7..000000000 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api21-Default/tab-view-binding-third-tab.png and /dev/null differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-default.png index 9cd345ecc..96b65ee91 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-default.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-hidden.png index 9cd345ecc..96b65ee91 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-shown.png index e017d9953..69387cb82 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-always-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-default.png index edf61335c..49b4436e5 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-default.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-hidden.png index edf61335c..6a3cd82d5 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-shown.png index 445b7c3ed..85fca7cb7 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Default/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-default.png new file mode 100644 index 000000000..d992e38a5 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-hidden.png new file mode 100644 index 000000000..b6ca95617 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-shown.png new file mode 100644 index 000000000..b6ca95617 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-always-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-default.png new file mode 100644 index 000000000..f63b5fe8d Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-hidden.png new file mode 100644 index 000000000..3b6875b90 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-shown.png new file mode 100644 index 000000000..413ddf8e5 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-default.png new file mode 100644 index 000000000..0f2fca64a Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-hidden.png new file mode 100644 index 000000000..35816ac63 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-shown.png new file mode 100644 index 000000000..d5393b063 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/actionBarVisibility-never-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-first-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-first-tab.png new file mode 100644 index 000000000..54f6fd597 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-first-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-second-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-second-tab.png new file mode 100644 index 000000000..8f3410ad4 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-second-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-third-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-third-tab.png new file mode 100644 index 000000000..da64f2b00 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api22-Google/tab-view-binding-third-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-hidden.png index 3bd8a4d64..b3a3ad9fd 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-shown.png index b3a3ad9fd..3bd8a4d64 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api23-Default/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-hidden.png index 313a64685..71f266277 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-shown.png index 71f266277..313a64685 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api25-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-hidden.png index 938b019c9..b47cb9e45 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-shown.png index b47cb9e45..938b019c9 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api26-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-always-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-always-shown.png index 87ca98260..b52ebf70a 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-always-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-always-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-hidden.png index ebea2dea8..836da97a3 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-shown.png index 7414e39c4..40cd6413a 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api27-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png index 9ac141c2f..bee8777f6 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png index bee8777f6..9ac141c2f 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-hidden.png index c8509ceab..ee4064e34 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-shown.png index e72aaa9ed..33f839482 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 110/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-hidden.png index 6c433dfb5..f20e481c0 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-shown.png index 59ff9823b..81b463120 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/iPhone 7 12/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-hidden.png index 48bca2281..306e7275e 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-shown.png index 5c642f446..1fab9e6f3 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/iPhone XR 12/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/tsconfig.json b/e2e/renderer/e2e/tsconfig.json index 18b6c4302..6517ca58d 100644 --- a/e2e/renderer/e2e/tsconfig.json +++ b/e2e/renderer/e2e/tsconfig.json @@ -5,13 +5,14 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "importHelpers": false, + "sourceMap": true, "types": [ "node", "mocha", "chai" ], "lib": [ - "es6", + "es2015", "dom" ] } diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index d59b354b6..b2deb6d97 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,6 +7,7 @@ "id": "org.nativescript.renderer" }, "dependencies": { + "@angular/animations": "~8.2.0", "@angular/common": "~8.2.0", "@angular/compiler": "~8.2.0", "@angular/core": "~8.2.0", @@ -15,7 +16,7 @@ "@angular/platform-browser-dynamic": "~8.2.0", "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", - "nativescript-intl": "^3.0.0", + "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", "rxjs": "^6.4.0", "tns-core-modules": "next", @@ -27,17 +28,14 @@ "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "chai-as-promised": "~7.1.1", - "colors": "^1.1.2", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", "lazy": "1.0.11", "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", - "tslib": "^1.7.1", "typescript": "~3.5.3" }, "scripts": { diff --git a/e2e/renderer/tsconfig.json b/e2e/renderer/tsconfig.json index a4ddb2d04..d93d819b4 100644 --- a/e2e/renderer/tsconfig.json +++ b/e2e/renderer/tsconfig.json @@ -22,9 +22,16 @@ ] } }, + "include": [ + "../../nativescript-angular", + "**/*" + ], "exclude": [ + "../../nativescript-angular/node_modules", + "../../nativescript-angular/**/*.d.ts", "node_modules", "platforms", + "**/*.aot", "e2e" ] } \ No newline at end of file diff --git a/e2e/routable-animations/.gitignore b/e2e/routable-animations/.gitignore index d610480ff..4b67c8c63 100644 --- a/e2e/routable-animations/.gitignore +++ b/e2e/routable-animations/.gitignore @@ -14,3 +14,6 @@ test-results.xml tsconfig.esm.json webpack.config.js +# Tests +/**/mochawesome-report + diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api21-Default/home.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api21-Default/home.png deleted file mode 100644 index c717be762..000000000 Binary files a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api21-Default/home.png and /dev/null differ diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api21-Default/support.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api21-Default/support.png deleted file mode 100644 index c3009df52..000000000 Binary files a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api21-Default/support.png and /dev/null differ diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api22-Google/home.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api22-Google/home.png new file mode 100644 index 000000000..8c8e081af Binary files /dev/null and b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api22-Google/home.png differ diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api22-Google/support.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api22-Google/support.png new file mode 100644 index 000000000..ee833c142 Binary files /dev/null and b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api22-Google/support.png differ diff --git a/e2e/routable-animations/e2e/setup.ts b/e2e/routable-animations/e2e/setup.ts index 9c7b955b3..11b854fca 100644 --- a/e2e/routable-animations/e2e/setup.ts +++ b/e2e/routable-animations/e2e/setup.ts @@ -1,9 +1,19 @@ -import { startServer, stopServer } from "nativescript-dev-appium"; +import { startServer, stopServer, ITestReporter, nsCapabilities, LogImageType } from "nativescript-dev-appium"; +const addContext = require('mochawesome/addContext'); + +const testReporterContext = {}; +testReporterContext.name = "mochawesome"; +testReporterContext.reportDir = "mochawesome-report"; +testReporterContext.log = addContext; +testReporterContext.logImageTypes = [LogImageType.screenshots]; +nsCapabilities.testReporter = testReporterContext; before("start server", async function () { + nsCapabilities.testReporter.context = this; await startServer(); }); after("stop server", async function () { + nsCapabilities.testReporter.context = this; await stopServer(); }); diff --git a/e2e/routable-animations/e2e/tests.e2e.ts b/e2e/routable-animations/e2e/tests.e2e.ts index a8c6e0c4b..7b4011b21 100644 --- a/e2e/routable-animations/e2e/tests.e2e.ts +++ b/e2e/routable-animations/e2e/tests.e2e.ts @@ -1,4 +1,4 @@ -import { AppiumDriver, createDriver, SearchOptions } from "nativescript-dev-appium"; +import { AppiumDriver, createDriver, SearchOptions, nsCapabilities } from "nativescript-dev-appium"; import { assert } from "chai"; describe("sample scenario", () => { @@ -6,6 +6,7 @@ describe("sample scenario", () => { let driver: AppiumDriver; before(async function () { + nsCapabilities.testReporter.context = this; driver = await createDriver(); }); diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index c3b47a425..6bdb89c01 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -33,8 +33,10 @@ "babylon": "6.17.4", "colors": "^1.1.2", "lazy": "1.0.11", + "mocha": "~5.2.0", + "mochawesome": "~3.1.2", "nativescript-css-loader": "~0.26.0", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", "nativescript-dev-webpack": "next", "typescript": "~3.5.3" }, diff --git a/e2e/routable-animations/tsconfig.json b/e2e/routable-animations/tsconfig.json index a4ddb2d04..d93d819b4 100644 --- a/e2e/routable-animations/tsconfig.json +++ b/e2e/routable-animations/tsconfig.json @@ -22,9 +22,16 @@ ] } }, + "include": [ + "../../nativescript-angular", + "**/*" + ], "exclude": [ + "../../nativescript-angular/node_modules", + "../../nativescript-angular/**/*.d.ts", "node_modules", "platforms", + "**/*.aot", "e2e" ] } \ No newline at end of file diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 523805087..fd6e2df60 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -16,7 +16,6 @@ "@angular/platform-browser-dynamic": "~8.2.0", "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", - "nativescript-dev-webpack": "next", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", "rxjs": "^6.4.0", @@ -33,10 +32,11 @@ "lazy": "1.0.11", "mocha": "~5.2.0", "mochawesome": "~3.1.2", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", + "nativescript-dev-webpack": "next", "typescript": "~3.5.3", - "@angular/compiler-cli": "8.0.0", - "@ngtools/webpack": "8.0.0" + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/router/package.json b/e2e/router/package.json index 7b8954b3e..d9e3b1c91 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -36,7 +36,7 @@ "lazy": "1.0.11", "mocha": "~5.2.0", "mochawesome": "~3.1.2", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", "typescript": "~3.5.3" diff --git a/e2e/router/tsconfig.json b/e2e/router/tsconfig.json index a4ddb2d04..d93d819b4 100644 --- a/e2e/router/tsconfig.json +++ b/e2e/router/tsconfig.json @@ -22,9 +22,16 @@ ] } }, + "include": [ + "../../nativescript-angular", + "**/*" + ], "exclude": [ + "../../nativescript-angular/node_modules", + "../../nativescript-angular/**/*.d.ts", "node_modules", "platforms", + "**/*.aot", "e2e" ] } \ No newline at end of file diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 909e79e36..42927eeeb 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -36,7 +36,7 @@ "lazy": "1.0.11", "mocha": "~5.2.0", "mochawesome": "~3.1.2", - "nativescript-dev-appium": "^5.3.0", + "nativescript-dev-appium": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", "typescript": "~3.5.3" diff --git a/e2e/single-page/tsconfig.json b/e2e/single-page/tsconfig.json index a4ddb2d04..d93d819b4 100644 --- a/e2e/single-page/tsconfig.json +++ b/e2e/single-page/tsconfig.json @@ -22,9 +22,16 @@ ] } }, + "include": [ + "../../nativescript-angular", + "**/*" + ], "exclude": [ + "../../nativescript-angular/node_modules", + "../../nativescript-angular/**/*.d.ts", "node_modules", "platforms", + "**/*.aot", "e2e" ] } \ No newline at end of file diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index a4935f365..14546adfb 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -4,9 +4,16 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.testsappng" + "id": "org.nativescript.testsappng", + "tns-ios": { + "version": "6.0.2" + }, + "tns-android": { + "version": "6.0.2" + } }, "dependencies": { + "@angular/animations": "~8.2.0", "@angular/common": "~8.2.0", "@angular/compiler": "~8.2.0", "@angular/core": "~8.2.0", @@ -14,7 +21,7 @@ "@angular/platform-browser": "~8.2.0", "@angular/platform-browser-dynamic": "~8.2.0", "@angular/router": "~8.2.0", - "nativescript-angular": "next", + "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "~3.0.0", "nativescript-theme-core": "^1.0.4", "reflect-metadata": "~0.1.8", @@ -23,6 +30,8 @@ "zone.js": "^0.9.1" }, "devDependencies": { + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "babel-traverse": "6.24.1", "babel-types": "6.24.1", "babylon": "6.17.0", @@ -31,9 +40,7 @@ "lazy": "1.0.11", "nativescript-dev-webpack": "next", "tslint": "^5.4.3", - "typescript": "~3.5.3", - "@angular/compiler-cli": "~8.0.0", - "@ngtools/webpack": "~8.0.0" + "typescript": "~3.5.3" }, "scripts": { "tslint": "tslint --config tslint.json 'app/**/*.ts'" diff --git a/e2e/tests-app-ng/tsconfig.json b/e2e/tests-app-ng/tsconfig.json index f251eb444..d93d819b4 100644 --- a/e2e/tests-app-ng/tsconfig.json +++ b/e2e/tests-app-ng/tsconfig.json @@ -22,8 +22,16 @@ ] } }, + "include": [ + "../../nativescript-angular", + "**/*" + ], "exclude": [ + "../../nativescript-angular/node_modules", + "../../nativescript-angular/**/*.d.ts", "node_modules", - "platforms" + "platforms", + "**/*.aot", + "e2e" ] } \ No newline at end of file diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts index d6a4c557f..cd9d02dd4 100644 --- a/nativescript-angular/platform-common.ts +++ b/nativescript-angular/platform-common.ts @@ -6,6 +6,7 @@ import "./zone-js/dist/zone-nativescript"; import "./polyfills/array"; import "./polyfills/console"; import { profile, uptime } from "tns-core-modules/profiling"; +import { getRootView } from "tns-core-modules/application"; import "./dom-adapter"; import { @@ -153,6 +154,11 @@ export class NativeScriptPlatformRef extends PlatformRef { private bootstrapApp() { (global).__onLiveSyncCore = () => { if (this.appOptions.hmrOptions) { + const rootView = getRootView(); + if (rootView) { + rootView._closeAllModalViewsInternal(); + } + this.appOptions.hmrOptions.livesyncCallback(() => this._livesync()); } else { this._livesync(); diff --git a/tests/app/tests/detached-loader-tests.ts b/tests/app/tests/detached-loader-tests.ts index 1d54ee91e..1168ea3f8 100644 --- a/tests/app/tests/detached-loader-tests.ts +++ b/tests/app/tests/detached-loader-tests.ts @@ -33,9 +33,8 @@ export class LoaderComponent extends LoaderComponentBase {} ` }) export class LoaderComponentOnPush extends LoaderComponentBase { } - -describe("DetachedLoader", () => { - +describe("DetachedLoader", function() { + this.timeout(4000); beforeEach(nsTestBedBeforeEach([LoaderComponent, LoaderComponentOnPush], [], [], [TestComponent])); afterEach(nsTestBedAfterEach()); @@ -47,7 +46,7 @@ describe("DetachedLoader", () => { }); - it("creates component when ChangeDetectionStrategy is OnPush", () => { + it("creates component when ChangeDetectionStrategy is OnPush", function() { return nsTestBedRender(LoaderComponentOnPush).then((fixture) => { const component: LoaderComponentOnPush = fixture.componentRef.instance; return component.loader.loadComponent(TestComponent);