Skip to content

Commit fd239cf

Browse files
linilini
authored
Merge branch 'master' into location-strategy
2 parents a7de68f + 966ee42 commit fd239cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+176
-91
lines changed

Diff for: ‎CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
<a name="8.20.3"></a>
2+
## [8.20.3](https://github.com/NativeScript/nativescript-angular/compare/8.20.2...8.20.3) (2019-11-13)
3+
4+
5+
### Bug Fixes
6+
7+
* add exports for backwards compatibility ([fbd46c1](https://github.com/NativeScript/nativescript-angular/commit/fbd46c1))
8+
9+
<a name="8.20.2"></a>
10+
## [8.20.2](https://github.com/NativeScript/nativescript-angular/compare/8.20.1...8.20.2) (2019-11-12)
11+
12+
13+
### Bug Fixes
14+
15+
* add exports in `nativescript-angular` package for backwards compatibility ([4a5d022](https://github.com/NativeScript/nativescript-angular/commit/4a5d022))
16+
17+
18+
<a name="8.20.1"></a>
19+
# [8.20.1](https://github.com/NativeScript/nativescript-angular/compare/8.20.0...8.20.1) (2019-11-07)
20+
21+
### Bug Fixes
22+
23+
* add exports in `nativescript-angular` package for backwards compatibility
124
<a name="8.20.0"></a>
225
# [8.20.0](https://github.com/NativeScript/nativescript-angular/compare/8.2.2...8.20.0) (2019-10-23)
326

Diff for: ‎build/pack-scripts/pack-compat.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fs.emptyDirSync(tempFolderPath);
5656
fs.ensureDirSync(distFolderPath);
5757

5858
// Install, run tsc and run ngc
59-
execSync(`npm i && tsc && npm run ngc`, {
59+
execSync(`npm i && npm run tsc && npm run ngc`, {
6060
cwd: nsAngularPackagePath
6161
});
6262

Diff for: ‎e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api28-Google/add_active_items.png

11.1 KB
Loading

Diff for: ‎e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api28-Google/add_inactive_items.png

12.7 KB
Loading

Diff for: ‎e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api28-Google/add_remove_items.png

11.8 KB
Loading

Diff for: ‎e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api28-Google/add_reset_items.png

8.33 KB
Loading

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

-712 Bytes
Loading

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

-1.09 KB
Loading

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

-712 Bytes
Loading

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

-789 Bytes
Loading

Diff for: ‎e2e/animation-examples/e2e/smoke.e2e-spec.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { AnimationsWithDefaultOptionsPage } from "./pages/animations-with-defaul
1010
import { AnimateChildPage } from "./pages/animate-child-page";
1111
import { HeroPage } from "./pages/hero-page";
1212
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
13+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1314

1415
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.
1516
const isSauceRun = isSauceLab;
@@ -21,6 +22,8 @@ describe("smoke-tests", async function () {
2122
this.timeout(QUEUE_WAIT_TIME);
2223
nsCapabilities.testReporter.context = this;
2324
driver = await createDriver();
25+
driver.imageHelper.defaultTolerance = 50;
26+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2427
});
2528

2629
after(async function () {
@@ -145,16 +148,16 @@ describe("smoke-tests", async function () {
145148
const heroPage = new HeroPage(driver);
146149
await heroPage.enterExample();
147150
await heroPage.addActive();
148-
let result = await driver.compareScreen("add_active_items", 5, 0.01);
151+
let result = await driver.compareScreen("add_active_items", 5);
149152

150153
await heroPage.addInactive();
151-
result = await driver.compareScreen("add_inactive_items", 5, 0.01) && result;
154+
result = await driver.compareScreen("add_inactive_items", 5) && result;
152155

153156
await heroPage.remove();
154-
result = await driver.compareScreen("add_remove_items", 5, 0.01) && result;
157+
result = await driver.compareScreen("add_remove_items", 5) && result;
155158

156159
await heroPage.reset();
157-
result = await driver.compareScreen("add_reset_items", 5, 0.01) && result;
160+
result = await driver.compareScreen("add_reset_items", 5) && result;
158161

159162
assert.isTrue(result, "Image verification failed!");
160163

Diff for: ‎e2e/modal-navigation-ng/e2e/modal-frame.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
testDialogBackground
1111
} from "./screens/shared-screen";
1212
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
13+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1314

1415
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.
1516
const isSauceRun = isSauceLab;
@@ -23,6 +24,8 @@ describe("modal-frame:", async function () {
2324
this.timeout(QUEUE_WAIT_TIME);
2425
nsCapabilities.testReporter.context = this;
2526
driver = await createDriver();
27+
driver.imageHelper.defaultTolerance = 50;
28+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2629
screen = new Screen(driver);
2730
});
2831

Diff for: ‎e2e/modal-navigation-ng/e2e/modal-layout.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
testDialogBackground,
77
} from "./screens/shared-screen";
88
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
9+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
910

1011
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.
1112
const isSauceRun = isSauceLab;
@@ -18,6 +19,8 @@ describe("modal-layout:", async function () {
1819
this.timeout(QUEUE_WAIT_TIME);
1920
nsCapabilities.testReporter.context = this;
2021
driver = await createDriver();
22+
driver.imageHelper.defaultTolerance = 50;
23+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2124
screen = new Screen(driver);
2225
});
2326

Diff for: ‎e2e/modal-navigation-ng/e2e/modal-on-init.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
navigateToSecondComponent
77
} from "./screens/shared-screen";
88
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
9+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
910

1011
const roots = [
1112
"setTabRootViewModal",
@@ -24,6 +25,8 @@ describe("modal-on-init:", async function () {
2425
nsCapabilities.testReporter.context = this;
2526

2627
driver = await createDriver();
28+
driver.imageHelper.defaultTolerance = 50;
29+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2730
screen = new Screen(driver);
2831
});
2932

Diff for: ‎e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { AppiumDriver, createDriver, nsCapabilities } from "nativescript-dev-app
22
import { Screen } from "./screens/screen";
33
import { assertComponent, goBack, navigateToSecondComponent } from "./screens/shared-screen";
44
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
5+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
56

67
const homeComponent = "Home Component";
78
const roots = ["setFrameRootView", "setTabRootView"];
@@ -16,6 +17,8 @@ describe("modal-shared:", async function () {
1617
this.timeout(QUEUE_WAIT_TIME);
1718
nsCapabilities.testReporter.context = this;
1819
driver = await createDriver();
20+
driver.imageHelper.defaultTolerance = 50;
21+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
1922
screen = new Screen(driver);
2023
});
2124

Diff for: ‎e2e/nested-router-tab-view/e2e/custom-tabs.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
testTeamNavigated
66
} from "./shared.e2e-spec";
77
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
8+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
89

910
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.
1011
const isSauceRun = isSauceLab;
@@ -17,6 +18,8 @@ describe("custom-tabs:", async function () {
1718
this.timeout(QUEUE_WAIT_TIME);
1819
nsCapabilities.testReporter.context = this;
1920
driver = await createDriver();
21+
driver.imageHelper.defaultTolerance = 50;
22+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2023
screen = new Screen(driver);
2124
});
2225

Diff for: ‎e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
testPlayerNextNavigated
77
} from "./shared.e2e-spec";
88
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
9+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
910

1011
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.
1112
const isSauceRun = isSauceLab;
@@ -20,6 +21,8 @@ describe("home-tabs:", async function () {
2021
this.timeout(QUEUE_WAIT_TIME);
2122
nsCapabilities.testReporter.context = this;
2223
driver = await createDriver();
24+
driver.imageHelper.defaultTolerance = 50;
25+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2326
screen = new Screen(driver);
2427
});
2528

Diff for: ‎e2e/nested-router-tab-view/e2e/split-view.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
canGoBack
1010
} from "./shared.e2e-spec";
1111
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
12+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1213

1314
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.
1415
const isSauceRun = isSauceLab;
@@ -23,6 +24,8 @@ describe("split-view:", async function () {
2324
this.timeout(QUEUE_WAIT_TIME);
2425
nsCapabilities.testReporter.context = this;
2526
driver = await createDriver();
27+
driver.imageHelper.defaultTolerance = 50;
28+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2629
screen = new Screen(driver);
2730
});
2831

Diff for: ‎e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
testTeamNextNavigated,
88
} from "./shared.e2e-spec";
99
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
10+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1011

1112
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.
1213
const isSauceRun = isSauceLab;
@@ -19,6 +20,8 @@ describe("tab-view:", async function () {
1920
this.timeout(QUEUE_WAIT_TIME);
2021
nsCapabilities.testReporter.context = this;
2122
driver = await createDriver();
23+
driver.imageHelper.defaultTolerance = 50;
24+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2225
screen = new Screen(driver);
2326
});
2427

Diff for: ‎e2e/renderer/e2e/action-bar.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const isSauceRun = isSauceLab;
1212

1313
import { isOnTheLeft } from "./helpers/location";
1414
import { assert } from "chai";
15+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1516

1617
describe("Action Bar scenario", async function () {
1718
let driver: AppiumDriver;
@@ -20,6 +21,8 @@ describe("Action Bar scenario", async function () {
2021
this.timeout(QUEUE_WAIT_TIME);
2122
nsCapabilities.testReporter.context = this;
2223
driver = await createDriver();
24+
driver.imageHelper.defaultTolerance = 50;
25+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2326
await driver.driver.resetApp();
2427
});
2528

Diff for: ‎e2e/renderer/e2e/ngfor.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88

99
import { isAbove } from "./helpers/location";
1010
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
11+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1112

1213
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.
1314
const isSauceRun = isSauceLab;
@@ -23,6 +24,8 @@ describe("ngFor scenario", async function () {
2324
this.timeout(QUEUE_WAIT_TIME);
2425
nsCapabilities.testReporter.context = this;
2526
driver = await createDriver();
27+
driver.imageHelper.defaultTolerance = 50;
28+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2629
await driver.driver.resetApp();
2730
});
2831

Diff for: ‎e2e/renderer/e2e/ngforof.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88

99
import { isAbove } from "./helpers/location";
1010
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
11+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1112

1213
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.
1314

@@ -28,6 +29,8 @@ describe("ngForOf scenario", function () {
2829
this.timeout(QUEUE_WAIT_TIME);
2930
nsCapabilities.testReporter.context = this;
3031
driver = await createDriver();
32+
driver.imageHelper.defaultTolerance = 50;
33+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
3134
await driver.driver.resetApp();
3235
});
3336

Diff for: ‎e2e/renderer/e2e/ngif.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { isAbove } from "./helpers/location";
1010

1111
import { assert } from "chai";
1212
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
13+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1314

1415
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.
1516

@@ -22,6 +23,8 @@ describe("ngIf scenario", async function () {
2223
this.timeout(QUEUE_WAIT_TIME);
2324
nsCapabilities.testReporter.context = this;
2425
driver = await createDriver();
26+
driver.imageHelper.defaultTolerance = 50;
27+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2528
await driver.driver.resetApp();
2629
});
2730

Diff for: ‎e2e/renderer/e2e/page-router-outlet.e2e-spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ describe("page-router-outlet-scenario", async function () {
1818
this.timeout(QUEUE_WAIT_TIME);
1919
nsCapabilities.testReporter.context = this;
2020
driver = await createDriver();
21+
driver.imageHelper.defaultTolerance = 50;
22+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2123
await driver.driver.resetApp();
2224
});
2325

Diff for: ‎e2e/renderer/e2e/tab-view.e2e-spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ describe("TabView-scenario", async function(){
1818
this.timeout(QUEUE_WAIT_TIME);
1919
nsCapabilities.testReporter.context = this;
2020
driver = await createDriver();
21+
driver.imageHelper.defaultTolerance = 50;
22+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
2123
await driver.driver.resetApp();
2224
});
2325

Diff for: ‎e2e/routable-animations/e2e/tests.e2e.ts

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ describe("sample scenario", function () {
1313
this.timeout(QUEUE_WAIT_TIME);
1414
nsCapabilities.testReporter.context = this;
1515
driver = await createDriver();
16+
driver.imageHelper.defaultTolerance = 50;
17+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
1618
});
1719

1820
after(async function () {

Diff for: ‎e2e/router-tab-view/e2e/tab-view-navigation.e2e-spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { AppiumDriver, createDriver, SearchOptions, nsCapabilities } from "nativescript-dev-appium";
22
import { assert } from "chai";
33
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
4+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
45

56
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.
67

@@ -11,6 +12,8 @@ describe("TabView with page-router-outlet in each tab", async function () {
1112
this.timeout(QUEUE_WAIT_TIME);
1213
nsCapabilities.testReporter.context = this;
1314
driver = await createDriver();
15+
driver.imageHelper.defaultTolerance = 50;
16+
driver.imageHelper.defaultToleranceType = ImageOptions.pixel;
1417
});
1518

1619
after(async function () {

0 commit comments

Comments
 (0)