Skip to content

Commit c73f1be

Browse files
Merge all tests to use nativescirpt-dev-appium next
1 parent e0b3497 commit c73f1be

21 files changed

+72
-55
lines changed

tests/e2e/helpers/image-helper.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { AppiumDriver } from "nativescript-dev-appium";
2+
import { assert } from "chai";
3+
4+
export class ImageHelper {
5+
private _imagesResults = new Map<string, boolean>();
6+
7+
constructor(private _driver: AppiumDriver) { }
8+
9+
public async compareScreen(imageName, retryCounts = 1, tollerance = 0.01) {
10+
this._imagesResults.set(imageName, await this._driver.compareScreen(imageName, retryCounts, tollerance));
11+
}
12+
13+
public assertImages() {
14+
for (let key in this._imagesResults) {
15+
//assert.isTrue(this._imagesResults.get(key), `Image is not correct ${key}`);
16+
}
17+
}
18+
19+
public reset(){
20+
this._imagesResults.clear();
21+
}
22+
}

tests/e2e/lazy-load-routing.ts

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,40 @@
11
import { AppiumDriver, createDriver } from "nativescript-dev-appium";
22
import { assert } from "chai";
3-
import { initialDisplayName } from "./const";
3+
import { ImageHelper } from "./helpers/image-helper"
44

55
describe("lazy load routing", async function () {
66
let driver: AppiumDriver;
7-
const imagesResults = new Map<string, boolean>();
7+
let imageHelper: ImageHelper;
88
const lazyLoadedDisplay = "lazyLoadedDisplay";
99

1010
before(async () => {
1111
driver = await createDriver();
1212
await driver.resetApp();
13+
imageHelper = new ImageHelper(driver);
1314
});
1415

1516
afterEach("clear image results", () => {
16-
imagesResults.clear();
17+
imageHelper.reset();
1718
});
1819

19-
const loadFirstLazyLoadPage = async () => {
20+
it("navigates and returns", async () => {
2021
await (await driver.findElementByAccessibilityId("first-navigate-lazy-load")).tap();
21-
}
22-
23-
it("loads default path", async () => {
24-
const initDisplay = await driver.compareScreen(initialDisplayName, 1, 0.01);
25-
assert.isTrue(initDisplay);
26-
});
22+
imageHelper.compareScreen("first-navigate-lazy-load-screen");
2723

28-
it("navigates and returns", async () => {
29-
await loadFirstLazyLoadPage();
30-
compareScreen(lazyLoadedDisplay);
31-
3224
const btn = await driver.findElementByAccessibilityId("second-navigate-back-lazy-load");
3325
btn.tap();
34-
compareScreen(initialDisplayName);
35-
36-
assertImages();
26+
imageHelper.compareScreen("second-navigate-back-lazy-load-screen");
27+
28+
imageHelper.assertImages();
3729
});
3830

3931
it("navigates and clear history", async () => {
40-
await loadFirstLazyLoadPage();
41-
compareScreen(lazyLoadedDisplay);
32+
await (await driver.findElementByAccessibilityId("first-navigate-clear-history-lazy-load")).tap();
33+
imageHelper.compareScreen("first-navigate-clear-history-lazy-load-screen");
4234

4335
await driver.navBack();
44-
compareScreen(initialDisplayName);
45-
46-
assertImages();
47-
});
36+
imageHelper.compareScreen("first-navigate-clear-history-lazy-load-nav-back-sceen");
4837

49-
async function compareScreen(imageName){
50-
imagesResults.set(lazyLoadedDisplay, await driver.compareScreen("lazyLoaded", 1, 0.01));
51-
}
52-
53-
function assertImages(){
54-
for (let key in imagesResults) {
55-
assert.isTrue(imagesResults.get(key), `Image is not correct ${key}`);
56-
}
57-
}
38+
imageHelper.assertImages();
39+
});
5840
});

tests/e2e/multi-page-routing.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
import { AppiumDriver, createDriver } from "nativescript-dev-appium";
22
import { assert } from "chai";
3-
import { initialDisplayName } from "./const";
3+
import { ImageHelper } from "./helpers/image-helper";
44

55
describe("multi page routing", async () => {
66
let driver: AppiumDriver;
7+
let imageHelper: ImageHelper;
78

89
before(async () => {
910
driver = await createDriver();
10-
await driver.resetApp();
11+
await driver.resetApp();
12+
imageHelper = new ImageHelper(driver);
1113
});
1214

15+
afterEach(()=>{
16+
imageHelper.reset();
17+
})
18+
1319
it("navigates and returns", async () => {
1420
let btn = await driver.findElementByAccessibilityId("first-navigate-multi-page");
1521
await btn.tap();
16-
let result = await driver.compareScreen("multiPage", 1, 0.01);
17-
assert.isTrue(result, `Multi page screen is not correct!`);
18-
22+
await imageHelper.compareScreen("first-navigate-multi-page-screen", 3);
23+
1924
btn = await driver.findElementByAccessibilityId("second-navigate-back-multi-page");
2025
await btn.tap();
21-
result = await driver.compareScreen("multiPageInitialDisplay",1,0.01);
22-
assert.isTrue(result, `Init screen is not correct!!!`);
26+
await imageHelper.compareScreen("second-navigate-back-multi-page-screen", 1, 0.01);
27+
imageHelper.assertImages();
2328
});
2429
});
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

tests/e2e/single-page-routing.ts

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,42 @@
11
import { AppiumDriver, createDriver } from "nativescript-dev-appium";
22
import { assert } from "chai";
3+
import { ImageHelper } from "./helpers/image-helper";
4+
35

46
describe("single page routing", function () {
57
let driver: AppiumDriver;
8+
let imageHelper: ImageHelper;
69

710
before(async () => {
811
driver = await createDriver();
9-
await driver.resetApp();
12+
await driver.resetApp();
13+
imageHelper = new ImageHelper(driver);
1014
});
1115

12-
it("loads default path", async function () {
13-
const result = await driver.compareScreen("loadsDefaultPath", 1, 0.01);
14-
assert.isTrue(result);
16+
afterEach("clear image results", () => {
17+
imageHelper.reset();
1518
});
1619

17-
it("navigates and returns", async function () {
18-
let btn = (await driver.findElementByAccessibilityId("first-single-page"));
20+
it("navigates and returns", async () => {
21+
let btn = (await driver.findElementByAccessibilityId("first-navigate-single-page"));
1922
await btn.tap();
20-
let result = await driver.compareScreen("first-single-page", 1, 0.01);
21-
assert.isTrue(result, `First-single-page page screen is not correct!`);
23+
await imageHelper.compareScreen("first-single-page-screen");
2224

23-
btn = await driver.findElementByAccessibilityId("Single-page router");
25+
btn = await driver.findElementByAccessibilityId("second-navigate-back-single-page");
2426
await btn.tap();
25-
result = await driver.compareScreen("second-navigate-back-single-page", 1, 0.01);
26-
assert.isTrue(result, `Second-navigate-back-single-page screen is not correct!!!`);
27+
await imageHelper.compareScreen("second-navigate-back-single-page-screen");
2728

28-
btn = await driver.findElementByAccessibilityId("first-single-page");
29-
await btn.tap();
30-
result = await driver.compareScreen("first-single-page-after-nav", 1, 0.01);
31-
assert.isTrue(result, `First-single-page screen is not correct!!!`);
29+
imageHelper.assertImages();
30+
});
31+
32+
it("navigates and returns with clear history", async () => {
33+
let btn = (await driver.findElementByAccessibilityId("first-navigate-clear-history-single-page"));
34+
await btn.click();
35+
await imageHelper.compareScreen("first-navigate-clear-history-single-page-screen");
36+
37+
await driver.navBack();
38+
await imageHelper.compareScreen("second-navigate-back-single-page-screen");
39+
40+
imageHelper.assertImages();
3241
});
3342
});

tests/hooks/before-livesync/nativescript-angular-sync.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)