Skip to content

Commit ff9b159

Browse files
SvetoslavTsenovSvetoslavTsenov
committed
Include wait for element after action
1 parent 83f5a09 commit ff9b159

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

‎tests/e2e-tests/lazy-load-routing.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var nsAppium = require("nativescript-dev-appium");
3-
3+
var defaultWaitTime = 300000;
44
describe("lazy load routing", function () {
55
this.timeout(360000);
66
var driver;
@@ -19,7 +19,7 @@ describe("lazy load routing", function () {
1919

2020
it("loads default path", function () {
2121
return driver
22-
.waitForElementByAccessibilityId("first-lazy-load", 300000)
22+
.waitForElementByAccessibilityId("first-lazy-load", defaultWaitTime)
2323
.elementByAccessibilityId("first-lazy-load")
2424
.should.eventually.exist
2525
.text().should.eventually.equal("First: lazy-load")
@@ -32,10 +32,11 @@ describe("lazy load routing", function () {
3232
"second.destroy"] // <-- back (first component is reused)
3333
.join(",");
3434
return driver
35-
.waitForElementByAccessibilityId("first-navigate-lazy-load", 300000)
35+
.waitForElementByAccessibilityId("first-navigate-lazy-load", defaultWaitTime)
3636
.elementByAccessibilityId("first-navigate-lazy-load")
3737
.should.eventually.exist
3838
.tap()
39+
.waitForElementByAccessibilityId("second-lazy-load", defaultWaitTime)
3940
.elementByAccessibilityId("second-lazy-load")
4041
.should.eventually.exist
4142
.text().should.eventually.equal("Second: lazy-load")
@@ -44,6 +45,7 @@ describe("lazy load routing", function () {
4445
.elementByAccessibilityId("second-navigate-back-lazy-load")
4546
.should.eventually.exist
4647
.tap()
48+
.waitForElementByAccessibilityId("first-lazy-load", defaultWaitTime)
4749
.elementByAccessibilityId("first-lazy-load")
4850
.should.eventually.exist
4951
.text().should.eventually.equal("First: lazy-load")
@@ -53,10 +55,11 @@ describe("lazy load routing", function () {
5355

5456
it("navigates and clear history", function() {
5557
return driver
56-
.waitForElementByAccessibilityId("first-navigate-lazy-load", 300000)
58+
.waitForElementByAccessibilityId("first-navigate-lazy-load", defaultWaitTime)
5759
.elementByAccessibilityId("first-navigate-clear-history-lazy-load")
5860
.should.eventually.exist
5961
.tap()
62+
.waitForElementByAccessibilityId("second-lazy-load", defaultWaitTime)
6063
.elementByAccessibilityId("second-lazy-load")
6164
.should.eventually.exist
6265
.text().should.eventually.equal("Second: lazy-load")

‎tests/e2e-tests/multi-page-routing.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22
var nsAppium = require("nativescript-dev-appium");
3+
var defaultWaitTime = 300000;
34

45
describe("multi page routing", function () {
56
this.timeout(360000);
@@ -11,17 +12,17 @@ describe("multi page routing", function () {
1112

1213
after(function () {
1314
return driver
14-
.quit()
15-
.finally(function () {
16-
console.log("Driver quit successfully");
17-
});
15+
.quit()
16+
.finally(function () {
17+
console.log("Driver quit successfully");
18+
});
1819
});
1920

2021
it("loads default path", function () {
2122
return driver
2223
.waitForElementByAccessibilityId("first-multi-page", 300000)
2324
.elementByAccessibilityId("first-multi-page")
24-
.should.eventually.exist
25+
.should.eventually.exist
2526
.text().should.eventually.equal("First: multi-page")
2627
});
2728

@@ -32,20 +33,22 @@ describe("multi page routing", function () {
3233
"second.destroy"] // <-- back (first component is reused)
3334
.join(",");
3435
return driver
35-
.waitForElementByAccessibilityId("first-navigate-multi-page", 300000)
36+
.waitForElementByAccessibilityId("first-navigate-multi-page", defaultWaitTime)
3637
.elementByAccessibilityId("first-navigate-multi-page")
37-
.should.eventually.exist
38+
.should.eventually.exist
3839
.tap()
40+
.waitForElementByAccessibilityId("second-multi-page", defaultWaitTime)
3941
.elementByAccessibilityId("second-multi-page")
40-
.should.eventually.exist
42+
.should.eventually.exist
4143
.text().should.eventually.equal("Second: multi-page")
4244
.elementByAccessibilityId("second-navigate-back-multi-page")
43-
.should.eventually.exist
45+
.should.eventually.exist
4446
.tap()
47+
.waitForElementByAccessibilityId("first-multi-page", defaultWaitTime)
4548
.elementByAccessibilityId("first-multi-page")
46-
.should.eventually.exist
47-
.text().should.eventually.equal("First: multi-page")
49+
.should.eventually.exist
50+
.text().should.eventually.equal("First: multi-page")
4851
.elementByAccessibilityId("hooks-log-multi-page")
49-
.text().should.eventually.equal(expectedHookLog)
52+
.text().should.eventually.equal(expectedHookLog)
5053
});
5154
});

‎tests/e2e-tests/single-page-routing.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22
var nsAppium = require("nativescript-dev-appium");
3+
var defaultWaitTime = 300000;
34

45
describe("single page routing", function () {
56
this.timeout(360000);
@@ -19,7 +20,7 @@ describe("single page routing", function () {
1920

2021
it("loads default path", function () {
2122
return driver
22-
.waitForElementByAccessibilityId("first-single-page", 300000)
23+
.waitForElementByAccessibilityId("first-single-page", defaultWaitTime)
2324
.elementByAccessibilityId("first-single-page")
2425
.should.eventually.exist
2526
.text().should.eventually.equal("First: single-page")
@@ -34,16 +35,18 @@ describe("single page routing", function () {
3435
"first.init"].join(",");
3536

3637
return driver
37-
.waitForElementByAccessibilityId("first-single-page", 300000)
38+
.waitForElementByAccessibilityId("first-single-page", defaultWaitTime)
3839
.elementByAccessibilityId("first-navigate-single-page")
3940
.should.eventually.exist
4041
.tap()
42+
.waitForElementByAccessibilityId("second-single-page", defaultWaitTime)
4143
.elementByAccessibilityId("second-single-page")
4244
.should.eventually.exist
4345
.text().should.eventually.equal("Second: single-page")
4446
.elementByAccessibilityId("second-navigate-back-single-page")
4547
.should.eventually.exist
4648
.tap()
49+
.waitForElementByAccessibilityId("first-single-page", defaultWaitTime)
4750
.elementByAccessibilityId("first-single-page")
4851
.should.eventually.exist
4952
.text().should.eventually.equal("First: single-page")

0 commit comments

Comments
 (0)