Skip to content

Commit 699c5df

Browse files
SvetoslavTsenovSvetoslavTsenov
committed
Merge remote-tracking branch 'origin/master' into merge-release-in-master
2 parents 33f30dd + 86cd290 commit 699c5df

File tree

16 files changed

+181
-137
lines changed

16 files changed

+181
-137
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright (c) 2015-2018 Progress Software Corporation
189+
Copyright (c) 2015-2019 Progress Software Corporation
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~7.1.0",
17-
"@angular/common": "~7.1.0",
18-
"@angular/compiler": "~7.1.0",
19-
"@angular/core": "~7.1.0",
20-
"@angular/forms": "~7.1.0",
21-
"@angular/http": "~7.1.0",
22-
"@angular/platform-browser": "~7.1.0",
23-
"@angular/platform-browser-dynamic": "~7.1.0",
24-
"@angular/router": "~7.1.0",
16+
"@angular/animations": "~7.2.0",
17+
"@angular/common": "~7.2.0",
18+
"@angular/compiler": "~7.2.0",
19+
"@angular/core": "~7.2.0",
20+
"@angular/forms": "~7.2.0",
21+
"@angular/http": "~7.2.0",
22+
"@angular/platform-browser": "~7.2.0",
23+
"@angular/platform-browser-dynamic": "~7.2.0",
24+
"@angular/router": "~7.2.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -30,8 +30,8 @@
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~7.1.0",
34-
"@ngtools/webpack": "~7.1.0",
33+
"@angular/compiler-cli": "~7.2.0",
34+
"@ngtools/webpack": "~7.2.0",
3535
"@types/chai": "^4.0.2",
3636
"@types/mocha": "^5.2.5",
3737
"@types/node": "^10.12.12",
@@ -44,7 +44,7 @@
4444
"mocha-junit-reporter": "^1.18.0",
4545
"mocha-multi": "^1.0.1",
4646
"nativescript-dev-appium": "next",
47-
"nativescript-dev-typescript": "~0.7.8",
47+
"nativescript-dev-typescript": "next",
4848
"nativescript-dev-webpack": "next",
4949
"typescript": "~3.1.1"
5050
},

‎e2e/nested-router-tab-view/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~6.1.0",
17-
"@angular/common": "~6.1.0",
18-
"@angular/compiler": "~6.1.0",
19-
"@angular/core": "~6.1.0",
20-
"@angular/forms": "~6.1.0",
21-
"@angular/http": "~6.1.0",
22-
"@angular/platform-browser": "~6.1.0",
23-
"@angular/platform-browser-dynamic": "~6.1.0",
24-
"@angular/router": "~6.1.0",
16+
"@angular/animations": "~7.2.0",
17+
"@angular/common": "~7.2.0",
18+
"@angular/compiler": "~7.2.0",
19+
"@angular/core": "~7.2.0",
20+
"@angular/forms": "~7.2.0",
21+
"@angular/http": "~7.2.0",
22+
"@angular/platform-browser": "~7.2.0",
23+
"@angular/platform-browser-dynamic": "~7.2.0",
24+
"@angular/router": "~7.2.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -30,8 +30,8 @@
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~7.1.0",
34-
"@ngtools/webpack": "~7.1.0",
33+
"@angular/compiler-cli": "~7.2.0",
34+
"@ngtools/webpack": "~7.2.0",
3535
"@types/chai": "^4.0.2",
3636
"@types/mocha": "^5.2.5",
3737
"@types/node": "^10.12.12",
@@ -44,7 +44,7 @@
4444
"mocha-junit-reporter": "^1.18.0",
4545
"mocha-multi": "^1.0.1",
4646
"nativescript-dev-appium": "next",
47-
"nativescript-dev-typescript": "~0.7.4",
47+
"nativescript-dev-typescript": "next",
4848
"nativescript-dev-webpack": "next",
4949
"typescript": "~3.1.1"
5050
},

‎e2e/renderer/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"id": "org.nativescript.renderer"
88
},
99
"dependencies": {
10-
"@angular/common": "~7.1.0",
11-
"@angular/compiler": "~7.1.0",
12-
"@angular/core": "~7.1.0",
13-
"@angular/forms": "~7.1.0",
14-
"@angular/http": "~7.1.0",
15-
"@angular/platform-browser": "~7.1.0",
16-
"@angular/platform-browser-dynamic": "~7.1.0",
17-
"@angular/router": "~7.1.0",
10+
"@angular/common": "~7.2.0",
11+
"@angular/compiler": "~7.2.0",
12+
"@angular/core": "~7.2.0",
13+
"@angular/forms": "~7.2.0",
14+
"@angular/http": "~7.2.0",
15+
"@angular/platform-browser": "~7.2.0",
16+
"@angular/platform-browser-dynamic": "~7.2.0",
17+
"@angular/router": "~7.2.0",
1818
"nativescript-angular": "file:../../nativescript-angular",
1919
"nativescript-intl": "^3.0.0",
2020
"reflect-metadata": "~0.1.8",
@@ -23,8 +23,8 @@
2323
"zone.js": "^0.8.4"
2424
},
2525
"devDependencies": {
26-
"@angular/compiler-cli": "~7.1.0",
27-
"@ngtools/webpack": "~7.1.0",
26+
"@angular/compiler-cli": "~7.2.0",
27+
"@ngtools/webpack": "~7.2.0",
2828
"@types/chai": "~4.1.3",
2929
"@types/mocha": "~5.2.1",
3030
"@types/node": "10.11.4",
@@ -39,7 +39,7 @@
3939
"mocha-junit-reporter": "~1.17.0",
4040
"mocha-multi": "~1.0.0",
4141
"nativescript-dev-appium": "next",
42-
"nativescript-dev-typescript": "~0.7.1",
42+
"nativescript-dev-typescript": "next",
4343
"nativescript-dev-webpack": "next",
4444
"tslib": "^1.7.1",
4545
"typescript": "~3.1.1"

‎e2e/router-tab-view/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~7.1.0",
17-
"@angular/common": "~7.1.0",
18-
"@angular/compiler": "~7.1.0",
19-
"@angular/core": "~7.1.0",
20-
"@angular/forms": "~7.1.0",
21-
"@angular/http": "~7.1.0",
22-
"@angular/platform-browser": "~7.1.0",
23-
"@angular/platform-browser-dynamic": "~7.1.0",
24-
"@angular/router": "~7.1.0",
16+
"@angular/animations": "~7.2.0",
17+
"@angular/common": "~7.2.0",
18+
"@angular/compiler": "~7.2.0",
19+
"@angular/core": "~7.2.0",
20+
"@angular/forms": "~7.2.0",
21+
"@angular/http": "~7.2.0",
22+
"@angular/platform-browser": "~7.2.0",
23+
"@angular/platform-browser-dynamic": "~7.2.0",
24+
"@angular/router": "~7.2.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -41,7 +41,7 @@
4141
"mocha-junit-reporter": "~1.17.0",
4242
"mocha-multi": "~1.0.0",
4343
"nativescript-dev-appium": "next",
44-
"nativescript-dev-typescript": "~0.6.0",
44+
"nativescript-dev-typescript": "next",
4545
"typescript": "~3.1.1"
4646
},
4747
"scripts": {

‎e2e/router/app/first/first.component.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, OnDestroy, OnChanges } from "@angular/core";
1+
import { Component, OnInit, OnDestroy, OnChanges, DoCheck } from "@angular/core";
22
import { ActivatedRoute, Router, Route } from "@angular/router";
33
import { Location } from "@angular/common";
44
import { RouterExtensions } from "nativescript-angular/router";
@@ -18,11 +18,14 @@ import { Page } from "tns-core-modules/ui/page";
1818
<Button text="GO TO C-LESS LAZY" automationText="GO TO C-LESS LAZY" [nsRouterLink]="['/lazy','nest','more']"></Button>
1919
2020
<Button text="BACK" automationText="BACK" (tap)="goBack()"></Button>
21+
<Button text="RESET" automationText="RESET" (tap)="reset()"></Button>
2122
<Label [text]="message"></Label>
23+
<Label [text]="'CHECK: ' + doCheckCount"></Label>
2224
</StackLayout>`
2325
})
24-
export class FirstComponent implements OnInit, OnDestroy {
26+
export class FirstComponent implements OnInit, OnDestroy, DoCheck {
2527
public message: string = "";
28+
public doCheckCount: number = 0;
2629
constructor(private routerExt: RouterExtensions, page: Page) {
2730
console.log("FirstComponent - constructor() page: " + page);
2831
}
@@ -35,6 +38,15 @@ export class FirstComponent implements OnInit, OnDestroy {
3538
console.log("FirstComponent - ngOnDestroy()");
3639
}
3740

41+
ngDoCheck() {
42+
this.doCheckCount++;
43+
console.log("FirstComponent - ngDoCheck(): " + this.doCheckCount);
44+
}
45+
46+
reset() {
47+
this.doCheckCount = 0;
48+
}
49+
3850
goBack() {
3951
this.message = "";
4052
if (this.routerExt.canGoBack()) {

‎e2e/router/e2e/router.e2e-spec.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,37 @@ describe("Navigate to componentless lazy module route", () => {
406406
});
407407
});
408408

409+
describe("Simple navigate and back should trigger only one CD on FirstComponent", () => {
410+
let driver: AppiumDriver;
411+
412+
before(async () => {
413+
driver = await createDriver();
414+
await driver.resetApp();
415+
});
416+
417+
it("should find First", async () => {
418+
await assureFirstComponent(driver);
419+
});
420+
421+
it("should reset counter", async () => {
422+
await findAndClick(driver, "RESET");
423+
await driver.waitForElement("CHECK: 1");
424+
});
425+
426+
it("should navigate to Second(1)/master", async () => {
427+
await findAndClick(driver, "GO TO SECOND");
428+
429+
await assureSecondComponent(driver, 1);
430+
await assureNestedMasterComponent(driver);
431+
});
432+
433+
it("should navigate back to First", async () => {
434+
await goBack(driver);
435+
await assureFirstComponent(driver);
436+
await driver.waitForElement("CHECK: 2");
437+
});
438+
});
439+
409440
async function assureFirstComponent(driver: AppiumDriver) {
410441
await driver.findElementByAutomationText("FirstComponent");
411442
}

‎e2e/router/package.json‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44
"readme": "NativeScript Application",
55
"repository": "<fill-your-repository-here>",
66
"nativescript": {
7-
"id": "org.nativescript.router"
7+
"id": "org.nativescript.router",
8+
"tns-android": {
9+
"version": "5.1.0"
10+
}
811
},
912
"dependencies": {
10-
"@angular/animations": "~7.1.0",
11-
"@angular/common": "~7.1.0",
12-
"@angular/compiler": "~7.1.0",
13-
"@angular/core": "~7.1.0",
14-
"@angular/forms": "~7.1.0",
15-
"@angular/http": "~7.1.0",
16-
"@angular/platform-browser": "~7.1.0",
17-
"@angular/platform-browser-dynamic": "~7.1.0",
18-
"@angular/router": "~7.1.0",
13+
"@angular/animations": "~7.2.0",
14+
"@angular/common": "~7.2.0",
15+
"@angular/compiler": "~7.2.0",
16+
"@angular/core": "~7.2.0",
17+
"@angular/forms": "~7.2.0",
18+
"@angular/http": "~7.2.0",
19+
"@angular/platform-browser": "~7.2.0",
20+
"@angular/platform-browser-dynamic": "~7.2.0",
21+
"@angular/router": "~7.2.0",
1922
"nativescript-angular": "file:../../nativescript-angular",
2023
"nativescript-intl": "^3.0.0",
2124
"reflect-metadata": "~0.1.8",
@@ -24,10 +27,10 @@
2427
"zone.js": "^0.8.4"
2528
},
2629
"devDependencies": {
27-
"@ngtools/webpack": "~7.1.0",
28-
"@angular/compiler-cli": "~7.1.0",
29-
"@types/chai": "^4.0.2",
30-
"@types/mocha": "^5.2.5",
30+
"@angular/compiler-cli": "~7.2.0",
31+
"@ngtools/webpack": "~7.2.0",
32+
"@types/chai": "~4.1.7",
33+
"@types/mocha": "~5.2.5",
3134
"@types/node": "^10.12.12",
3235
"babel-traverse": "6.25.0",
3336
"babel-types": "6.25.0",
@@ -36,14 +39,14 @@
3639
"chai-as-promised": "~7.1.1",
3740
"colors": "^1.1.2",
3841
"lazy": "1.0.11",
39-
"mocha": "~3.5.0",
40-
"mocha-junit-reporter": "^1.13.0",
41-
"mocha-multi": "^0.11.0",
42-
"nativescript-dev-appium": "next",
43-
"nativescript-dev-typescript": "~0.4.0",
42+
"mocha": "~5.2.0",
43+
"mocha-junit-reporter": "~1.18.0",
44+
"mocha-multi": "~1.0.1",
45+
"nativescript-dev-appium": "^4.0.10-2019-01-16-01",
46+
"nativescript-dev-typescript": "^0.7.10-next-2019-01-07-183215-03",
4447
"nativescript-dev-webpack": "next",
4548
"tslib": "^1.7.1",
46-
"typescript": "~3.1.1"
49+
"typescript": "^3.1.6"
4750
},
4851
"scripts": {
4952
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

‎e2e/router/references.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.

‎e2e/router/tsconfig.tns.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"module": "es2015",
5+
"moduleResolution": "node"
6+
}
7+
}

0 commit comments

Comments
 (0)