Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b6bcf7f

Browse files
author
Elena Hristova
committed
Merge remote-tracking branch 'origin/master' into merge-release-in-master
2 parents 3d277fd + f5f0262 commit b6bcf7f

File tree

82 files changed

+121
-55
lines changed

Some content is hidden

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

82 files changed

+121
-55
lines changed

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,33 @@ 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+
const animatedBtn = await this.animatedBtn();
16+
this.initialPositionOfAnimatedBtn = await animatedBtn.location();
1617
}
1718

18-
get btnToggleAnimation() {
19-
return this._driver.findElementByAccessibilityId("toggleAnimation");
19+
async btnToggleAnimation() {
20+
return awaitthis._driver.findElementByAccessibilityId("toggleAnimation");
2021
}
2122

22-
get animatedBtn() {
23-
this._driver.findElementsByAccessibilityId("animatedBtn", 10000);
24-
return this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
23+
async animatedBtn() {
24+
await this._driver.wait(2000);
25+
const btn = await this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
26+
return btn;
2527
}
2628

2729
async toggleAnimation() {
28-
const btnTapToDisappear = await this.btnToggleAnimation;
30+
const btnTapToDisappear = await this.btnToggleAnimation();
2931
await btnTapToDisappear.click();
3032
}
3133

3234
async waitElementToHide() {
33-
return this.waitElementTo(() => this.animatedBtn, false, 10000);
35+
await this._driver.wait(2000);
36+
return await this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
3437
}
3538

3639
async assertPositionOfToggleAnimationBtn() {
37-
this.waitElementTo(() => this.btnToggleAnimation, true, 5000);
38-
const point: Point = await (await this.btnToggleAnimation).location();
40+
awaitthis.waitElementTo(() => this.btnToggleAnimation(), true, 5000);
41+
const point: Point = await (await this.btnToggleAnimation()).location();
3942
assert.isTrue(point.y === this.initialPositionOfAnimatedBtn.y);
4043
}
4144
}
-55.2 KB
Binary file not shown.
-67.2 KB
Binary file not shown.
-55.9 KB
Binary file not shown.
-33.6 KB
Binary file not shown.
95.3 KB
114 KB
95.7 KB
57.1 KB

‎e2e/animation-examples/e2e/smoke.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe("smoke-tests", async function () {
8787
await animationWithOptionsPage.enterExample();
8888
await animationWithOptionsPage.toggleAnimation();
8989
const result = await animationWithOptionsPage.waitElementToHide();
90-
assert.isFalse(result.isVisible, "The button should disappear!");
90+
assert.isUndefined(result, "The button should disappear!");
9191

9292
await animationWithOptionsPage.assertPositionOfToggleAnimationBtn();
9393
});

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /