From fe2f7265d3b72f8d2d4ca87214ce1ecc460d499b Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 5 May 2020 15:27:16 +0900
Subject: [PATCH] Add retries to find the text on page for e2e tests

The page may not be fully loaded on the first go. Hence, we wait for some time and then retry.
---
 packages/cli/e2e-test/helpers.js | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/packages/cli/e2e-test/helpers.js b/packages/cli/e2e-test/helpers.js
index 7e34f10a63..2745c3269b 100644
--- a/packages/cli/e2e-test/helpers.js
+++ b/packages/cli/e2e-test/helpers.js
@@ -97,7 +97,7 @@ async function waitForPageWithText(
   text,
   { intervalMs = 1000, maxAttempts = 240 } = {},
 ) {
-  let attempts = 0;
+  let attemptsToLoad = 0;
   for (;;) {
     try {
       await new Promise(resolve => setTimeout(resolve, intervalMs));
@@ -105,8 +105,8 @@ async function waitForPageWithText(
       break;
     } catch (error) {
       if (error.message.match(EXPECTED_LOAD_ERRORS)) {
-        attempts++;
-        if (attempts > maxAttempts) {
+        attemptsToLoad++;
+        if (attemptsToLoad > maxAttempts) {
           throw new Error(
             `Failed to load page '${path}', max number of attempts reached`,
           );
@@ -117,12 +117,28 @@ async function waitForPageWithText(
     }
   }
 
+  // The page may not be fully loaded and hence we need to retry.
+  const maxAttemptsToSearchText = 3;
+  let attemptsToSearchText = 0;
   const escapedText = text.replace(/"/g, '\\"');
-  browser.assert.evaluate(
-    `Array.from(document.querySelectorAll("*")).some(el => el.textContent === "${escapedText}")`,
-    true,
-    `expected to find text ${text}`,
-  );
+  for (;;) {
+    try {
+      browser.assert.evaluate(
+        `Array.from(document.querySelectorAll("*")).some(el => el.textContent === "${escapedText}")`,
+        true,
+        `expected to find text ${text}`,
+      );
+    } catch (error) {
+      if (error instanceof browser.assert.AssertionError) {
+        attemptsToSearchText++;
+        if (attemptsToSearchText <= maxAttemptsToSearchText) {
+          await new Promise(resolve => setTimeout(resolve, intervalMs));
+          continue
+        }
+      }
+      throw error;
+    }
+  }
 }
 
 function print(msg) {