From 8caef01f884b8bb9427003adcf1af63ffb0b66b0 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 10 Nov 2021 15:41:51 +0200 Subject: [PATCH 01/13] fixes for login method --- appium/tests/screenobjects/splash.screen.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index eabe5b9ea..832ee56a5 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -146,7 +146,8 @@ class SplashScreen extends BaseScreen { this.clickContinueBtn(); this.changeLanguage(); this.gmailLogin(email, password); - browser.pause(10000); // STABILITY FIX UNTIL WE WLL FIGURE OUT WITH ISSUE + // browser.pause(10000); // STABILITY FIX UNTIL WE WLL FIGURE OUT WITH ISSUE + this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 10000, reverse: true}); } } From 58ee836d99f758f57e322c70732f4045a89739f0 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 10 Nov 2021 16:24:39 +0200 Subject: [PATCH 02/13] changed timeout --- appium/tests/screenobjects/splash.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index 832ee56a5..2acda3dd6 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -147,7 +147,7 @@ class SplashScreen extends BaseScreen { this.changeLanguage(); this.gmailLogin(email, password); // browser.pause(10000); // STABILITY FIX UNTIL WE WLL FIGURE OUT WITH ISSUE - this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 10000, reverse: true}); + this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 7000, reverse: true}); } } From d697ea9d45816c42d7135736ba7022e2926cd92f Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 10 Nov 2021 17:12:24 +0200 Subject: [PATCH 03/13] removed timeout --- appium/tests/screenobjects/splash.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index 2acda3dd6..698d8034f 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -147,7 +147,7 @@ class SplashScreen extends BaseScreen { this.changeLanguage(); this.gmailLogin(email, password); // browser.pause(10000); // STABILITY FIX UNTIL WE WLL FIGURE OUT WITH ISSUE - this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 7000, reverse: true}); + this.signInAsGoogleAccounLabel.waitForDisplayed({reverse: true}); } } From e605b904a5bf55225db1c21140e7096fcf51768e Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 10 Nov 2021 18:07:32 +0200 Subject: [PATCH 04/13] removed timeout --- appium/tests/screenobjects/splash.screen.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index 9343c9570..f7dddeed8 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -156,7 +156,6 @@ class SplashScreen extends BaseScreen { this.clickContinueBtn(); this.changeLanguage(); this.gmailLogin(email, password); - // browser.pause(10000); // STABILITY FIX UNTIL WE WLL FIGURE OUT WITH ISSUE this.signInAsGoogleAccounLabel.waitForDisplayed({reverse: true}); } } From f0f1eebffcaed05af0b1d5301c3c7084a52f7e2c Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 11 Nov 2021 10:07:18 +0200 Subject: [PATCH 05/13] added timeout for waitForDisplayed method --- appium/tests/screenobjects/splash.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index f7dddeed8..80853091a 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -156,7 +156,7 @@ class SplashScreen extends BaseScreen { this.clickContinueBtn(); this.changeLanguage(); this.gmailLogin(email, password); - this.signInAsGoogleAccounLabel.waitForDisplayed({reverse: true}); + this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 10000, reverse: true}); } } From 49fa763f918db47f2fa82eb377f541efbcdf776e Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 11 Nov 2021 10:49:52 +0200 Subject: [PATCH 06/13] changed timeout --- appium/tests/screenobjects/splash.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index 80853091a..76f993b61 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -156,7 +156,7 @@ class SplashScreen extends BaseScreen { this.clickContinueBtn(); this.changeLanguage(); this.gmailLogin(email, password); - this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 10000, reverse: true}); + this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 15000, reverse: true}); } } From 03eb8c3f92f5e2f17a634bd5496adc10652b723f Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 11 Nov 2021 11:49:08 +0200 Subject: [PATCH 07/13] changed timeout --- appium/tests/screenobjects/splash.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/splash.screen.ts b/appium/tests/screenobjects/splash.screen.ts index 76f993b61..218116b38 100644 --- a/appium/tests/screenobjects/splash.screen.ts +++ b/appium/tests/screenobjects/splash.screen.ts @@ -156,7 +156,7 @@ class SplashScreen extends BaseScreen { this.clickContinueBtn(); this.changeLanguage(); this.gmailLogin(email, password); - this.signInAsGoogleAccounLabel.waitForDisplayed({timeout: 15000, reverse: true}); + ElementHelper.waitElementInvisible(this.signInAsGoogleAccounLabel); } } From 4102863884a2ee36e2880f13f73bc3791bc96b95 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 11 Nov 2021 13:40:24 +0200 Subject: [PATCH 08/13] added loop for waiting pass phrase field --- appium/tests/screenobjects/create-key.screen.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts index 470023f23..b944448be 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/create-key.screen.ts @@ -31,6 +31,11 @@ class CreateKeyScreen extends BaseScreen { } setPassPhrase(text: string = CommonData.account.passPhrase) { + let count = 0; + do { + browser.pause(1000); + count++; + } while(this.enterPassPhraseField.isDisplayed() !== true && count <= 15); this.fillPassPhrase(text); this.clickSetPassPhraseBtn(); this.confirmPassPhrase(text); From c9c2be23b36a93f8a38bdc3cecac1acdfec86e33 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 11 Nov 2021 13:41:36 +0200 Subject: [PATCH 09/13] changed && to || --- appium/tests/screenobjects/create-key.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts index b944448be..a620e9d83 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/create-key.screen.ts @@ -35,7 +35,7 @@ class CreateKeyScreen extends BaseScreen { do { browser.pause(1000); count++; - } while(this.enterPassPhraseField.isDisplayed() !== true && count <= 15); + } while(this.enterPassPhraseField.isDisplayed() !== true || count <= 15); this.fillPassPhrase(text); this.clickSetPassPhraseBtn(); this.confirmPassPhrase(text); From 98410534678f188f9a273049c4d684083aaeed72 Mon Sep 17 00:00:00 2001 From: Tom J <6306961+tomholub@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:10:34 +0100 Subject: [PATCH 10/13] Update create-key.screen.ts --- appium/tests/screenobjects/create-key.screen.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts index a620e9d83..23fa7c65e 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/create-key.screen.ts @@ -31,6 +31,11 @@ class CreateKeyScreen extends BaseScreen { } setPassPhrase(text: string = CommonData.account.passPhrase) { + // retrying several times because following login, we switch + // from webview to our own view and then to another one several + // times, which was causing flaky tests. Originally we did a 10s + // delay but now instead we're retrying once per second until + // we see what we expect. let count = 0; do { browser.pause(1000); From 1de2b28c0de65fd4460e109076ec5e910d7e9717 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Fri, 12 Nov 2021 09:52:01 +0200 Subject: [PATCH 11/13] added console.log(count) for debugging iterations count --- appium/tests/screenobjects/create-key.screen.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts index a620e9d83..8053d9c90 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/create-key.screen.ts @@ -34,6 +34,7 @@ class CreateKeyScreen extends BaseScreen { let count = 0; do { browser.pause(1000); + console.log(count); count++; } while(this.enterPassPhraseField.isDisplayed() !== true || count <= 15); this.fillPassPhrase(text); From 31d7bd3dd86107f2521497aa55e524f6867f47ac Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Fri, 12 Nov 2021 10:26:32 +0200 Subject: [PATCH 12/13] changed || to && --- appium/tests/screenobjects/create-key.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts index 119f220a5..a697429ff 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/create-key.screen.ts @@ -41,7 +41,7 @@ class CreateKeyScreen extends BaseScreen { browser.pause(1000); console.log(count); count++; - } while(this.enterPassPhraseField.isDisplayed() !== true || count <= 15); + } while(this.enterPassPhraseField.isDisplayed() !== true && count <= 15); this.fillPassPhrase(text); this.clickSetPassPhraseBtn(); this.confirmPassPhrase(text); From c1061a7d53ffdfdeec0d6f403e980f23066c2c38 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Fri, 12 Nov 2021 11:04:59 +0200 Subject: [PATCH 13/13] removed console.log(count) --- appium/tests/screenobjects/create-key.screen.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/create-key.screen.ts index a697429ff..483b2c733 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/create-key.screen.ts @@ -39,7 +39,6 @@ class CreateKeyScreen extends BaseScreen { let count = 0; do { browser.pause(1000); - console.log(count); count++; } while(this.enterPassPhraseField.isDisplayed() !== true && count <= 15); this.fillPassPhrase(text);