Merge remote-tracking branch 'origin/master' into merge-release-in-master

Author: Elena Hristova

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

@@ -12,30 +12,33 @@ export class AnimationWithOptionsPage extends BasePage {
     async enterExample() {
         const exampleBtn = await this._driver.findElementByAccessibilityId("options");
         await exampleBtn.click();
-        this.initialPositionOfAnimatedBtn = await (await this.animatedBtn).location();
+        const animatedBtn = await this.animatedBtn();
+        this.initialPositionOfAnimatedBtn = await animatedBtn.location();
     }
 
-    get btnToggleAnimation() {
-        return this._driver.findElementByAccessibilityId("toggleAnimation");
+    async btnToggleAnimation() {
+        return await this._driver.findElementByAccessibilityId("toggleAnimation");
     }
 
-    get animatedBtn() {
-        this._driver.findElementsByAccessibilityId("animatedBtn", 10000);
-        return this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
+    async animatedBtn() {
+        await this._driver.wait(2000);
+        const btn = await this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
+        return btn;
     }
 
     async toggleAnimation() {
-        const btnTapToDisappear = await this.btnToggleAnimation;
+        const btnTapToDisappear = await this.btnToggleAnimation();
         await btnTapToDisappear.click();
     }
 
     async waitElementToHide() {
-        return this.waitElementTo(() => this.animatedBtn, false, 10000);
+        await this._driver.wait(2000);
+        return await this._driver.findElementByAccessibilityIdIfExists("animatedBtn");
     }
 
     async assertPositionOfToggleAnimationBtn() {
-        this.waitElementTo(() => this.btnToggleAnimation, true, 5000);
-        const point: Point = await (await this.btnToggleAnimation).location();
+        await this.waitElementTo(() => this.btnToggleAnimation(), true, 5000);
+        const point: Point = await (await this.btnToggleAnimation()).location();
         assert.isTrue(point.y === this.initialPositionOfAnimatedBtn.y);
     }
 }

e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api21-Default/add_active_items.png

@@ -87,7 +87,7 @@ describe("smoke-tests", async function () {
         await animationWithOptionsPage.enterExample();
         await animationWithOptionsPage.toggleAnimation();
         const result = await animationWithOptionsPage.waitElementToHide();
-        assert.isFalse(result.isVisible, "The button should disappear!");
+        assert.isUndefined(result, "The button should disappear!");
 
         await animationWithOptionsPage.assertPositionOfToggleAnimationBtn();
     });