From 653dbb344940974bd4cb9574e3f986410bbd243f Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sat, 25 Sep 2021 22:03:54 -0400
Subject: [PATCH] tests: Wait for pad init before returning from
 `helper.aNewPad()`

This should make it easier to avoid race conditions.
---
 src/tests/frontend/helper.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tests/frontend/helper.js b/src/tests/frontend/helper.js
index 37d5d548c..7da7fff04 100644
--- a/src/tests/frontend/helper.js
+++ b/src/tests/frontend/helper.js
@@ -132,9 +132,11 @@ const helper = {};
     if (opts.padPrefs) {
       helper.setPadPrefCookie(opts.padPrefs);
     }
+    const $loading = helper.padChrome$('#editorloadingbox');
+    const $container = helper.padChrome$('#editorcontainer');
     try {
       await helper.waitForPromise(
-          () => !$iframe.contents().find('#editorloadingbox').is(':visible'), 10000);
+          () => !$loading.is(':visible') && $container.hasClass('initialized'), 10000);
     } catch (err) {
       if (opts._retry++ >= 4) throw new Error('Pad never loaded');
       return await helper.aNewPad(opts);