Skip to content

Commit e3ae236

Browse files
Zdravko BranzovZdravko Branzov
Zdravko Branzov
authored and
Zdravko Branzov
committed
chore: fix the rest renderer apis, animation-example tests and remove api21
1 parent 72e8baa commit e3ae236

28 files changed

+17
-10
lines changed

e2e/animation-examples/e2e/pages/animation-with-options-page.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,30 @@ export class AnimationWithOptionsPage extends BasePage {
1212
async enterExample() {
1313
const exampleBtn = await this._driver.findElementByAccessibilityId("options");
1414
await exampleBtn.click();
15-
this.initialPositionOfAnimatedBtn = await (await this.animatedBtn).location();
15+
this.initialPositionOfAnimatedBtn = await (await this.animatedBtn()).location();
1616
}
1717

18-
get btnToggleAnimation() {
19-
return this._driver.findElementByAccessibilityId("toggleAnimation");
18+
async btnToggleAnimation() {
19+
return await this._driver.findElementByAccessibilityId("toggleAnimation");
2020
}
2121

22-
get animatedBtn() {
23-
this._driver.findElementsByAccessibilityId("animatedBtn", 10000);
24-
return this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
22+
async animatedBtn() {
23+
await this._driver.findElementsByAccessibilityId("animatedBtn", 10000);
24+
return await this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
2525
}
2626

2727
async toggleAnimation() {
28-
const btnTapToDisappear = await this.btnToggleAnimation;
28+
const btnTapToDisappear = await this.btnToggleAnimation();
2929
await btnTapToDisappear.click();
3030
}
3131

3232
async waitElementToHide() {
33-
return this.waitElementTo(() => this.animatedBtn, false, 10000);
33+
return await this.waitElementTo(() => this.animatedBtn(), false, 10000);
3434
}
3535

3636
async assertPositionOfToggleAnimationBtn() {
37-
this.waitElementTo(() => this.btnToggleAnimation, true, 5000);
38-
const point: Point = await (await this.btnToggleAnimation).location();
37+
await this.waitElementTo(() => this.btnToggleAnimation(), true, 5000);
38+
const point: Point = await (await this.btnToggleAnimation()).location();
3939
assert.isTrue(point.y === this.initialPositionOfAnimatedBtn.y);
4040
}
4141
}

e2e/animation-examples/tsconfig.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,16 @@
2222
]
2323
}
2424
},
25+
"include": [
26+
"../../nativescript-angular",
27+
"**/*"
28+
],
2529
"exclude": [
30+
"../../nativescript-angular/node_modules",
31+
"../../nativescript-angular/**/*.d.ts",
2632
"node_modules",
2733
"platforms",
34+
"**/*.aot",
2835
"e2e"
2936
]
3037
}

0 commit comments

Comments
 (0)