From 5fc0ce3e375b62704dd92d2bd66abdd447eac75b Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 23 Aug 2020 13:43:18 +0200
Subject: [PATCH] e2e-test: make waitFor time out

---
 packages/e2e-test/src/helpers.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/e2e-test/src/helpers.ts b/packages/e2e-test/src/helpers.ts
index 783b7e3988..b59de75860 100644
--- a/packages/e2e-test/src/helpers.ts
+++ b/packages/e2e-test/src/helpers.ts
@@ -91,9 +91,14 @@ export function handleError(err: Error & { code?: unknown }) {
  * .cancel() is available
  * @returns {Promise} Promise of resolution
  */
-export function waitFor(fn: () => boolean) {
-  return new Promise(resolve => {
+export function waitFor(fn: () => boolean, maxSeconds: number = 120) {
+  let count = 0;
+  return new Promise((resolve, reject) => {
     const handle = setInterval(() => {
+      if (count++ > maxSeconds * 10) {
+        reject(new Error('Timed out while waiting for condition'));
+        return;
+      }
       if (fn()) {
         clearInterval(handle);
         resolve();