1 files changed, 16 insertions, 5 deletions
diff --git a/test/e2e/beta/helpers.js b/test/e2e/beta/helpers.js
index 08416857e..5e3f45b2b 100644
--- a/test/e2e/beta/helpers.js
+++ b/test/e2e/beta/helpers.js
@@ -85,11 +85,22 @@ async function openNewPage (driver, url) {
   await delay(1000)
 }
 
-async function waitUntilXWindowHandles (driver, x) {
-  const windowHandles = await driver.getAllWindowHandles()
-  if (windowHandles.length === x) return
-  await delay(1000)
-  return await waitUntilXWindowHandles(driver, x)
+async function waitUntilXWindowHandles (driver, x, delayStep = 1000, timeout = 5000) {
+  let timeElapsed = 0
+  async function _pollWindowHandles () {
+    const windowHandles = await driver.getAllWindowHandles()
+    if (windowHandles.length === x) {
+      return
+    }
+    await delay(delayStep)
+    timeElapsed += delayStep
+    if (timeElapsed > timeout) {
+      throw new Error('waitUntilXWindowHandles timed out polling window handles')
+    } else {
+      await _pollWindowHandles()
+    }
+  }
+  return await _pollWindowHandles()
 }
 
 async function switchToWindowWithTitle (driver, title, windowHandles) {