test: stability fixes for python e2e tests

supertokens · Nov 27, 2024 · 8e15196 · 8e15196
1 parent be15381
commit 8e15196
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/test/end-to-end/emailverification.test.js b/test/end-to-end/emailverification.test.js
@@ -428,7 +428,12 @@ describe("SuperTokens Email Verification", function () {
             await page.waitForSelector(".sessionInfo-user-id");
             await waitForUrl(page, "/dashboard");
 
-            await page.evaluate((url) => window.fetch(url), `${TEST_APPLICATION_SERVER_BASE_URL}/unverifyEmail`);
+            await Promise.all([
+                page.waitForResponse(
+                    (response) => response.url() === SEND_VERIFY_EMAIL_API && response.status() === 200
+                ),
+                page.evaluate((url) => window.fetch(url), `${TEST_APPLICATION_SERVER_BASE_URL}/unverifyEmail`),
+            ]);
             await waitForSTElement(page, "[data-supertokens~='sendVerifyEmailIcon']");
 
             await waitForUrl(page, "/auth/verify-email");

diff --git a/test/helpers.js b/test/helpers.js
@@ -514,23 +514,15 @@ export async function submitFormReturnRequestAndResponse(page, URL) {
     };
 }
 
-export async function hasMethodBeenCalled(page, URL, method = "GET", timeout = 1000) {
-    let methodCalled = false;
-
-    const onRequestVerifyMatch = (request) => {
-        // If method called before hasMethodBeenCalled timeouts, update methodCalled.
-        if (request.url() === URL && request.method() === method) {
-            methodCalled = true;
-        }
-        request.continue();
-    };
-
-    await page.setRequestInterception(true);
-    page.on("request", onRequestVerifyMatch);
-    await new Promise((r) => setTimeout(r, timeout));
-    await page.setRequestInterception(false);
-    page.off("request", onRequestVerifyMatch);
-    return methodCalled;
+export async function hasMethodBeenCalled(page, URL, method = "GET", timeout = 2000) {
+    try {
+        await page.waitForResponse((response) => response.url() === URL && response.request().method() === method, {
+            timeout,
+        });
+        return true;
+    } catch (e) {
+        return false;
+    }
 }
 
 export async function assertFormFieldsEqual(actual, expected, values) {