[TS_SELENIUM] Resolve problem with notifications interaction (bug #13864

) (#14019) Signed-off-by: Ihor Okhrimenko <iokhrime@redhat.com>
eclipse-che · Jul 25, 2019 · 0bebced · 0bebced
1 parent 1b4cc73
commit 0bebced
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/e2e/pageobjects/ide/Ide.ts b/e2e/pageobjects/ide/Ide.ts
@@ -48,11 +48,35 @@ export class Ide {
     async waitNotificationAndConfirm(notificationText: string, timeout: number = TestConstants.TS_SELENIUM_DEFAULT_TIMEOUT) {
         await this.waitNotification(notificationText, timeout);
         await this.clickOnNotificationButton(notificationText, 'yes');
+
+        try {
+            await this.waitNotificationDisappearance(notificationText);
+        } catch (err) {
+            if (err instanceof error.TimeoutError) {
+                await this.clickOnNotificationButton(notificationText, 'yes');
+                await this.waitNotificationDisappearance(notificationText);
+                return;
+            }
+
+            throw err;
+        }
     }
 
     async waitNotificationAndOpenLink(notificationText: string, timeout: number = TestConstants.TS_SELENIUM_DEFAULT_TIMEOUT) {
         await this.waitNotification(notificationText, timeout);
         await this.clickOnNotificationButton(notificationText, 'Open Link');
+
+        try {
+            await this.waitNotificationDisappearance(notificationText);
+        } catch (err) {
+            if (err instanceof error.TimeoutError) {
+                await this.clickOnNotificationButton(notificationText, 'Open Link');
+                await this.waitNotificationDisappearance(notificationText);
+                return;
+            }
+
+            throw err;
+        }
     }
 
     async isNotificationPresent(notificationText: string): Promise<boolean> {