rwsdk 1.0.0-alpha.9 → 1.0.0-beta.1

package/dist/lib/e2e/testHarness.mjs

@@ -1,16 +1,57 @@
-import { test, beforeAll, afterAll, afterEach, } from "vitest";
-import { basename } from "path";
-import { setupTarballEnvironment } from "./tarball.mjs";
-import { runDevServer } from "./dev.mjs";
-import { runRelease, deleteWorker, deleteD1Database, isRelatedToTest, } from "./release.mjs";
+import fs from "fs-extra";
+import os from "os";
+import path, { basename, dirname, join as pathJoin } from "path";
+import puppeteer from "puppeteer-core";
+import { afterAll, afterEach, beforeAll, beforeEach, describe, test, } from "vitest";
 import { launchBrowser } from "./browser.mjs";
-const SETUP_PLAYGROUND_ENV_TIMEOUT = 10 * 60 * 1000;
+import { runDevServer } from "./dev.mjs";
+import { poll, pollValue } from "./poll.mjs";
+import { deleteD1Database, deleteWorker, isRelatedToTest, runRelease, } from "./release.mjs";
+import { setupTarballEnvironment } from "./tarball.mjs";
+const SETUP_PLAYGROUND_ENV_TIMEOUT = process.env
+    .RWSDK_SETUP_PLAYGROUND_ENV_TIMEOUT
+    ? parseInt(process.env.RWSDK_SETUP_PLAYGROUND_ENV_TIMEOUT, 10)
+    : 15 * 60 * 1000;
+const DEPLOYMENT_TIMEOUT = process.env.RWSDK_DEPLOYMENT_TIMEOUT
+    ? parseInt(process.env.RWSDK_DEPLOYMENT_TIMEOUT, 10)
+    : 5 * 60 * 1000;
+const DEPLOYMENT_MIN_TRIES = process.env.RWSDK_DEPLOYMENT_MIN_TRIES
+    ? parseInt(process.env.RWSDK_DEPLOYMENT_MIN_TRIES, 10)
+    : 5;
+const DEPLOYMENT_CHECK_TIMEOUT = process.env.RWSDK_DEPLOYMENT_CHECK_TIMEOUT
+    ? parseInt(process.env.RWSDK_DEPLOYMENT_CHECK_TIMEOUT, 10)
+    : 5 * 60 * 1000;
+const PUPPETEER_TIMEOUT = process.env.RWSDK_PUPPETEER_TIMEOUT
+    ? parseInt(process.env.RWSDK_PUPPETEER_TIMEOUT, 10)
+    : 60 * 1000 * 2;
+const HYDRATION_TIMEOUT = process.env.RWSDK_HYDRATION_TIMEOUT
+    ? parseInt(process.env.RWSDK_HYDRATION_TIMEOUT, 10)
+    : 5000;
+const DEV_SERVER_TIMEOUT = process.env.RWSDK_DEV_SERVER_TIMEOUT
+    ? parseInt(process.env.RWSDK_DEV_SERVER_TIMEOUT, 10)
+    : 5 * 60 * 1000;
+const DEV_SERVER_MIN_TRIES = process.env.RWSDK_DEV_SERVER_MIN_TRIES
+    ? parseInt(process.env.RWSDK_DEV_SERVER_MIN_TRIES, 10)
+    : 5;
+const SETUP_WAIT_TIMEOUT = process.env.RWSDK_SETUP_WAIT_TIMEOUT
+    ? parseInt(process.env.RWSDK_SETUP_WAIT_TIMEOUT, 10)
+    : 10 * 60 * 1000;
+const TEST_MAX_RETRIES = process.env.RWSDK_TEST_MAX_RETRIES
+    ? parseInt(process.env.RWSDK_TEST_MAX_RETRIES, 10)
+    : 10;
+const TEST_MAX_RETRIES_PER_CODE = process.env.RWSDK_TEST_MAX_RETRIES_PER_CODE
+    ? parseInt(process.env.RWSDK_TEST_MAX_RETRIES_PER_CODE, 10)
+    : 6;
 // Environment variable flags for skipping tests
 const SKIP_DEV_SERVER_TESTS = process.env.RWSDK_SKIP_DEV === "1";
 const SKIP_DEPLOYMENT_TESTS = process.env.RWSDK_SKIP_DEPLOY === "1";
 // Global test environment state
-let globalPlaygroundEnv = null;
-const cleanupTasks = [];
+let globalDevPlaygroundEnv = null;
+let globalDeployPlaygroundEnv = null;
+let globalDevInstancePromise = null;
+let globalDeploymentInstancePromise = null;
+let globalDevInstance = null;
+let globalDeploymentInstance = null;
 let hooksRegistered = false;
 /**
  * Registers global cleanup hooks automatically
@@ -18,49 +59,29 @@ let hooksRegistered = false;
 function ensureHooksRegistered() {
     if (hooksRegistered)
         return;
-    // Register global afterEach to clean up resources created during tests
-    afterEach(async () => {
-        const tasksToCleanup = [...cleanupTasks];
-        cleanupTasks.length = 0; // Clear the array
-        for (const task of tasksToCleanup) {
-            try {
-                await task.cleanup();
-            }
-            catch (error) {
-                console.warn(`Failed to cleanup ${task.type} ${task.id}:`, error);
-            }
-        }
-    });
     // Register global afterAll to clean up the playground environment
     afterAll(async () => {
-        if (globalPlaygroundEnv) {
-            try {
-                await globalPlaygroundEnv.cleanup();
-                globalPlaygroundEnv = null;
-            }
-            catch (error) {
-                console.warn("Failed to cleanup playground environment:", error);
-            }
+        const cleanupPromises = [];
+        if (globalDevInstance) {
+            cleanupPromises.push(globalDevInstance.stopDev());
+        }
+        if (globalDeploymentInstance) {
+            cleanupPromises.push(globalDeploymentInstance.cleanup());
+        }
+        if (globalDevPlaygroundEnv) {
+            cleanupPromises.push(globalDevPlaygroundEnv.cleanup());
         }
+        if (globalDeployPlaygroundEnv) {
+            cleanupPromises.push(globalDeployPlaygroundEnv.cleanup());
+        }
+        await Promise.all(cleanupPromises);
+        globalDevInstance = null;
+        globalDeploymentInstance = null;
+        globalDevPlaygroundEnv = null;
+        globalDeployPlaygroundEnv = null;
     });
     hooksRegistered = true;
 }
-/**
- * Registers a cleanup task to be executed automatically
- */
-function registerCleanupTask(task) {
-    ensureHooksRegistered();
-    cleanupTasks.push(task);
-}
-/**
- * Removes a cleanup task from the registry (when manually cleaned up)
- */
-function unregisterCleanupTask(id) {
-    const index = cleanupTasks.findIndex((task) => task.id === id);
-    if (index !== -1) {
-        cleanupTasks.splice(index, 1);
-    }
-}
 /**
  * Get the project directory for the current test by looking at the call stack
  */
@@ -70,28 +91,31 @@ function getProjectDirectory() {
     return "../playground/hello-world";
 }
 /**
- * Derive the playground directory from import.meta.url
+ * Derive the playground directory from import.meta.url by finding the nearest package.json
  */
 function getPlaygroundDirFromImportMeta(importMetaUrl) {
     const url = new URL(importMetaUrl);
     const testFilePath = url.pathname;
-    // Extract playground name from path like: /path/to/playground/PLAYGROUND_NAME/__tests__/e2e.test.mts
-    const playgroundMatch = testFilePath.match(/\/playground\/([^\/]+)\/__tests__\//);
-    if (playgroundMatch) {
-        const playgroundName = playgroundMatch[1];
-        // Return the absolute path to the playground directory
-        const playgroundPath = testFilePath.replace(/\/__tests__\/.*$/, "");
-        return playgroundPath;
+    let currentDir = dirname(testFilePath);
+    // Walk up the tree from the test file's directory
+    while (currentDir !== "/") {
+        // Check if a package.json exists in the current directory
+        if (fs.existsSync(pathJoin(currentDir, "package.json"))) {
+            return currentDir;
+        }
+        currentDir = dirname(currentDir);
     }
-    throw new Error(`Could not determine playground directory from import.meta.url: ${importMetaUrl}`);
+    throw new Error(`Could not determine playground directory from import.meta.url: ${importMetaUrl}. ` +
+        `Failed to find a package.json in any parent directory.`);
 }
 /**
- * Sets up a playground environment for the entire test suite.
- * Automatically registers beforeAll and afterAll hooks.
- *
- * @param sourceProjectDir - Explicit path to playground directory, or import.meta.url to auto-detect
+ * A Vitest hook that sets up a playground environment for a test file.
+ * It creates a temporary directory, copies the playground project into it,
+ * and installs dependencies using a tarball of the SDK.
+ * This ensures that tests run in a clean, isolated environment.
  */
-export function setupPlaygroundEnvironment(sourceProjectDir) {
+export function setupPlaygroundEnvironment(options = {}) {
+    const { sourceProjectDir, monorepoRoot, dev = true, deploy = true, } = typeof options === "string" ? { sourceProjectDir: options } : options;
     ensureHooksRegistered();
     beforeAll(async () => {
         let projectDir;
@@ -107,158 +131,129 @@ export function setupPlaygroundEnvironment(sourceProjectDir) {
             projectDir = sourceProjectDir;
         }
         console.log(`Setting up playground environment from ${projectDir}...`);
-        const tarballEnv = await setupTarballEnvironment({
-            projectDir,
-            packageManager: process.env.PACKAGE_MANAGER || "pnpm",
-        });
-        globalPlaygroundEnv = {
-            projectDir: tarballEnv.targetDir,
-            cleanup: tarballEnv.cleanup,
-        };
+        if (dev) {
+            const devEnv = await setupTarballEnvironment({
+                projectDir,
+                monorepoRoot,
+                packageManager: process.env.PACKAGE_MANAGER || "pnpm",
+            });
+            globalDevPlaygroundEnv = {
+                projectDir: devEnv.targetDir,
+                cleanup: devEnv.cleanup,
+            };
+            globalDevInstancePromise = createDevServer(devEnv.targetDir).then((instance) => {
+                globalDevInstance = instance;
+                return instance;
+            });
+            // Prevent unhandled promise rejections. The error will be handled inside
+            // the test's beforeEach hook where this promise is awaited.
+            globalDevInstancePromise.catch(() => { });
+        }
+        else {
+            globalDevInstancePromise = Promise.resolve(null);
+        }
+        if (deploy) {
+            const deployEnv = await setupTarballEnvironment({
+                projectDir,
+                monorepoRoot,
+                packageManager: process.env.PACKAGE_MANAGER || "pnpm",
+            });
+            globalDeployPlaygroundEnv = {
+                projectDir: deployEnv.targetDir,
+                cleanup: deployEnv.cleanup,
+            };
+            globalDeploymentInstancePromise = createDeployment(deployEnv.targetDir).then((instance) => {
+                globalDeploymentInstance = instance;
+                return instance;
+            });
+            // Prevent unhandled promise rejections
+            globalDeploymentInstancePromise.catch(() => { });
+        }
+        else {
+            globalDeploymentInstancePromise = Promise.resolve(null);
+        }
     }, SETUP_PLAYGROUND_ENV_TIMEOUT);
 }
-/**
- * Gets the current playground environment.
- * Throws if no environment has been set up.
- */
-export function getPlaygroundEnvironment() {
-    if (!globalPlaygroundEnv) {
-        throw new Error("No playground environment set up. Call setupPlaygroundEnvironment() in beforeAll()");
-    }
-    return globalPlaygroundEnv;
-}
 /**
  * Creates a dev server instance using the shared playground environment.
  * Automatically registers cleanup to run after the test.
  */
-export async function createDevServer() {
+export async function createDevServer(projectDir) {
     if (SKIP_DEV_SERVER_TESTS) {
         throw new Error("Dev server tests are skipped via RWSDK_SKIP_DEV=1");
     }
-    const env = getPlaygroundEnvironment();
     const packageManager = process.env.PACKAGE_MANAGER || "pnpm";
-    const devResult = await runDevServer(packageManager, env.projectDir);
-    const serverId = `devServer-${Date.now()}-${Math.random()
-        .toString(36)
-        .substring(2, 9)}`;
-    // Register automatic cleanup
-    registerCleanupTask({
-        id: serverId,
-        type: "devServer",
-        cleanup: devResult.stopDev,
+    const devResult = await pollValue(() => runDevServer(packageManager, projectDir), {
+        timeout: DEV_SERVER_TIMEOUT,
+        minTries: DEV_SERVER_MIN_TRIES,
+        onRetry: (error, tries) => {
+            console.log(`Retrying dev server creation (attempt ${tries})... Error: ${error.message}`);
+        },
     });
     return {
         url: devResult.url,
-        stopDev: async () => {
-            await devResult.stopDev();
-            unregisterCleanupTask(serverId); // Remove from auto-cleanup since manually cleaned
-        },
+        stopDev: devResult.stopDev,
     };
 }
 /**
  * Creates a deployment instance using the shared playground environment.
  * Automatically registers cleanup to run after the test.
  */
-export async function createDeployment() {
+export async function createDeployment(projectDir) {
     if (SKIP_DEPLOYMENT_TESTS) {
         throw new Error("Deployment tests are skipped via RWSDK_SKIP_DEPLOY=1");
     }
-    const env = getPlaygroundEnvironment();
-    // Extract the unique key from the project directory name instead of generating a new one
-    // The directory name format is: {projectName}-e2e-test-{randomId}
-    const dirName = basename(env.projectDir);
-    const match = dirName.match(/-e2e-test-([a-f0-9]+)$/);
-    const resourceUniqueKey = match
-        ? match[1]
-        : Math.random().toString(36).substring(2, 15);
-    const deployResult = await runRelease(env.projectDir, env.projectDir, resourceUniqueKey);
-    // Poll the URL to ensure it's live before proceeding
-    await poll(async () => {
-        try {
-            const response = await fetch(deployResult.url);
-            // We consider any response (even 4xx or 5xx) as success,
-            // as it means the worker is routable.
-            return response.status > 0;
-        }
-        catch (e) {
-            return false;
-        }
-    }, 60000);
-    const deploymentId = `deployment-${Date.now()}-${Math.random()
-        .toString(36)
-        .substring(2, 9)}`;
-    // Register automatic cleanup (non-blocking for deployments)
-    registerCleanupTask({
-        id: deploymentId,
-        type: "deployment",
-        cleanup: async () => {
+    return await pollValue(async () => {
+        // Extract the unique key from the project directory name instead of generating a new one
+        // The directory name format is: {projectName}-e2e-test-{randomId}
+        const dirName = basename(projectDir);
+        const match = dirName.match(/-e2e-test-([a-f0-9]+)$/);
+        const resourceUniqueKey = match
+            ? match[1]
+            : Math.random().toString(36).substring(2, 15);
+        const deployResult = await runRelease(projectDir, projectDir, resourceUniqueKey);
+        // Poll the URL to ensure it's live before proceeding
+        await poll(async () => {
+            try {
+                const response = await fetch(deployResult.url);
+                // We consider any response (even 4xx or 5xx) as success,
+                // as it means the worker is routable.
+                return response.status > 0;
+            }
+            catch (e) {
+                return false;
+            }
+        }, {
+            timeout: DEPLOYMENT_CHECK_TIMEOUT,
+        });
+        const cleanup = async () => {
             // Run deployment cleanup in background without blocking
             const performCleanup = async () => {
                 if (isRelatedToTest(deployResult.workerName, resourceUniqueKey)) {
-                    await deleteWorker(deployResult.workerName, env.projectDir, resourceUniqueKey);
+                    await deleteWorker(deployResult.workerName, projectDir, resourceUniqueKey);
                 }
-                await deleteD1Database(resourceUniqueKey, env.projectDir, resourceUniqueKey);
+                await deleteD1Database(resourceUniqueKey, projectDir, resourceUniqueKey);
             };
             // Start cleanup in background and return immediately
             performCleanup().catch((error) => {
                 console.warn(`Warning: Background deployment cleanup failed: ${error.message}`);
             });
             return Promise.resolve();
+        };
+        return {
+            url: deployResult.url,
+            workerName: deployResult.workerName,
+            resourceUniqueKey,
+            projectDir: projectDir,
+            cleanup,
+        };
+    }, {
+        timeout: DEPLOYMENT_TIMEOUT,
+        minTries: DEPLOYMENT_MIN_TRIES,
+        onRetry: (error, tries) => {
+            console.log(`Retrying deployment creation (attempt ${tries})... Error: ${error.message}`);
         },
     });
-    return {
-        url: deployResult.url,
-        workerName: deployResult.workerName,
-        resourceUniqueKey,
-        projectDir: env.projectDir,
-    };
-}
-/**
- * Manually cleans up a deployment instance (deletes worker and D1 database).
- * This is optional since cleanup happens automatically after each test.
- */
-export async function cleanupDeployment(deployment) {
-    const env = getPlaygroundEnvironment();
-    if (isRelatedToTest(deployment.workerName, deployment.resourceUniqueKey)) {
-        await deleteWorker(deployment.workerName, env.projectDir, deployment.resourceUniqueKey);
-    }
-    await deleteD1Database(deployment.resourceUniqueKey, env.projectDir, deployment.resourceUniqueKey);
-    // Remove from auto-cleanup registry since manually cleaned
-    const deploymentId = cleanupTasks.find((task) => task.type === "deployment" &&
-        task.id.includes(deployment.resourceUniqueKey))?.id;
-    if (deploymentId) {
-        unregisterCleanupTask(deploymentId);
-    }
-}
-/**
- * Creates a browser instance for testing.
- * Automatically registers cleanup to run after the test.
- */
-export async function createBrowser() {
-    // Check if we should run in headed mode for debugging
-    const headless = process.env.RWSDK_HEADLESS !== "false";
-    const browser = await launchBrowser(undefined, headless);
-    const browserId = `browser-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
-    // Register automatic cleanup
-    registerCleanupTask({
-        id: browserId,
-        type: "browser",
-        cleanup: async () => {
-            try {
-                await browser.close();
-            }
-            catch (error) {
-                // Browser might already be closed, ignore the error
-            }
-        },
-    });
-    // Wrap the close method to handle cleanup registration
-    const originalClose = browser.close.bind(browser);
-    browser.close = async () => {
-        await originalClose();
-        unregisterCleanupTask(browserId); // Remove from auto-cleanup since manually closed
-    };
-    return browser;
 }
 /**
  * Executes a test function with a retry mechanism for specific error codes.
@@ -269,193 +264,134 @@ export async function createBrowser() {
  *                     called automatically on failure.
  */
 export async function runTestWithRetries(name, attemptFn) {
-    const MAX_RETRIES_PER_CODE = 6;
     const retryCounts = {};
     let attempt = 0;
-    while (true) {
+    let lastError;
+    while (attempt < TEST_MAX_RETRIES) {
         attempt++;
-        let cleanup;
         try {
-            const res = await attemptFn();
-            cleanup = res.cleanup;
+            await attemptFn();
             if (attempt > 1) {
                 console.log(`[runTestWithRetries] Test "${name}" succeeded on attempt ${attempt}.`);
             }
-            // On success, we don't run cleanup here. It will be handled by afterEach.
             return; // Success
         }
         catch (e) {
-            // On failure, run the cleanup from the failed attempt.
-            // The cleanup function is attached to the error object on failure.
-            const errorCleanup = e.cleanup;
-            if (typeof errorCleanup === "function") {
-                await errorCleanup().catch((err) => console.warn(`[runTestWithRetries] Cleanup failed for "${name}" during retry:`, err));
-            }
+            lastError = e;
             const errorCode = e?.code;
             if (typeof errorCode === "string" && errorCode) {
                 const count = (retryCounts[errorCode] || 0) + 1;
                 retryCounts[errorCode] = count;
-                if (count <= MAX_RETRIES_PER_CODE) {
-                    console.log(`[runTestWithRetries] Attempt ${attempt} for "${name}" failed with code ${errorCode}. Retrying (failure ${count}/${MAX_RETRIES_PER_CODE} for this code)...`);
-                    await new Promise((resolve) => setTimeout(resolve, 1000));
-                    continue; // Next attempt
-                }
-                else {
-                    console.error(`[runTestWithRetries] Test "${name}" failed with code ${errorCode} after ${MAX_RETRIES_PER_CODE} retries for this code.`);
-                    throw e; // Give up
+                if (count > TEST_MAX_RETRIES_PER_CODE) {
+                    console.error(`[runTestWithRetries] Test "${name}" failed with code ${errorCode} after ${count - 1} retries. Max per-code retries (${TEST_MAX_RETRIES_PER_CODE}) exceeded.`);
+                    throw e; // Give up for this specific error code
                 }
             }
+            if (attempt < TEST_MAX_RETRIES) {
+                console.log(`[runTestWithRetries] Attempt ${attempt}/${TEST_MAX_RETRIES} for "${name}" failed. Retrying...`);
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
             else {
-                console.error(`[runTestWithRetries] Test "${name}" failed on attempt ${attempt} with a non-retryable error:`, e);
-                throw e;
+                console.error(`[runTestWithRetries] Test "${name}" failed after ${attempt} attempts.`);
             }
         }
     }
+    throw lastError;
 }
-/**
- * High-level test wrapper for dev server tests.
- * Automatically skips if RWSDK_SKIP_DEV=1
- */
-export function testDev(name, testFn) {
-    if (SKIP_DEV_SERVER_TESTS) {
-        test.skip(name, testFn);
-        return;
-    }
-    test(name, async () => {
-        await runTestWithRetries(name, async () => {
-            const devServer = await createDevServer();
-            const browser = await createBrowser();
-            const page = await browser.newPage();
-            const cleanup = async () => {
-                await browser.close();
-                await devServer.stopDev();
-            };
-            try {
-                await testFn({
-                    devServer,
-                    browser,
-                    page,
-                    url: devServer.url,
+function createTestRunner(testFn, envType) {
+    return (name, testLogic) => {
+        if ((envType === "dev" && SKIP_DEV_SERVER_TESTS) ||
+            (envType === "deploy" && SKIP_DEPLOYMENT_TESTS)) {
+            test.skip(name, () => { });
+            return;
+        }
+        describe.concurrent(name, () => {
+            let page;
+            let instance;
+            let browser;
+            beforeAll(async () => {
+                const tempDir = path.join(os.tmpdir(), "rwsdk-e2e-tests");
+                const wsEndpointFile = path.join(tempDir, "wsEndpoint");
+                try {
+                    const wsEndpoint = await fs.readFile(wsEndpointFile, "utf-8");
+                    browser = await puppeteer.connect({ browserWSEndpoint: wsEndpoint });
+                }
+                catch (error) {
+                    console.warn("Failed to connect to existing browser instance. " +
+                        "This might happen if you are running a single test file. " +
+                        "Launching a new browser instance instead.");
+                    browser = await launchBrowser();
+                }
+            }, SETUP_WAIT_TIMEOUT);
+            afterAll(async () => {
+                if (browser) {
+                    await browser.disconnect();
+                }
+            });
+            beforeEach(async () => {
+                const instancePromise = envType === "dev"
+                    ? globalDevInstancePromise
+                    : globalDeploymentInstancePromise;
+                if (!instancePromise) {
+                    throw new Error("Test environment promises not initialized. Call setupPlaygroundEnvironment() in your test file.");
+                }
+                [instance] = await Promise.all([instancePromise]);
+                if (!instance) {
+                    throw new Error(`No ${envType} instance found. Make sure to enable it in setupPlaygroundEnvironment.`);
+                }
+                page = await browser.newPage();
+                page.setDefaultTimeout(PUPPETEER_TIMEOUT);
+            }, SETUP_WAIT_TIMEOUT);
+            afterEach(async () => {
+                if (page) {
+                    try {
+                        await page.close();
+                    }
+                    catch (error) {
+                        // Suppress errors during page close, as the browser might already be disconnecting
+                        // due to the test suite finishing.
+                        console.warn(`Suppressing error during page.close() in test "${name}":`, error);
+                    }
+                }
+            });
+            testFn(">", async () => {
+                if (!instance || !browser) {
+                    throw new Error("Test environment not ready.");
+                }
+                await runTestWithRetries(name, async () => {
+                    await testLogic({
+                        [envType === "dev" ? "devServer" : "deployment"]: instance,
+                        browser: browser,
+                        page: page,
+                        url: instance.url,
+                    });
                 });
-                return { cleanup };
-            }
-            catch (error) {
-                // Ensure cleanup is available to the retry wrapper even if testFn fails.
-                // We re-throw the error to be handled by runTestWithRetries.
-                throw Object.assign(error, { cleanup });
-            }
+            });
         });
-    });
+    };
 }
 /**
- * Skip version of testDev
+ * High-level test wrapper for dev server tests.
+ * Automatically skips if RWSDK_SKIP_DEV=1
  */
+export function testDev(...args) {
+    return createTestRunner(test.concurrent, "dev")(...args);
+}
 testDev.skip = (name, testFn) => {
     test.skip(name, testFn || (() => { }));
 };
-testDev.only = (name, testFn) => {
-    if (SKIP_DEV_SERVER_TESTS) {
-        test.skip(name, () => { });
-        return;
-    }
-    test.only(name, async () => {
-        await runTestWithRetries(name, async () => {
-            const devServer = await createDevServer();
-            const browser = await createBrowser();
-            const page = await browser.newPage();
-            const cleanup = async () => {
-                await browser.close();
-                await devServer.stopDev();
-            };
-            try {
-                await testFn({
-                    devServer,
-                    browser,
-                    page,
-                    url: devServer.url,
-                });
-                return { cleanup };
-            }
-            catch (error) {
-                // Ensure cleanup is available to the retry wrapper even if testFn fails.
-                // We re-throw the error to be handled by runTestWithRetries.
-                throw Object.assign(error, { cleanup });
-            }
-        });
-    });
-};
+testDev.only = createTestRunner(test.only, "dev");
 /**
  * High-level test wrapper for deployment tests.
  * Automatically skips if RWSDK_SKIP_DEPLOY=1
  */
-export function testDeploy(name, testFn) {
-    if (SKIP_DEPLOYMENT_TESTS) {
-        test.skip(name, testFn);
-        return;
-    }
-    test(name, async () => {
-        await runTestWithRetries(name, async () => {
-            const deployment = await createDeployment();
-            const browser = await createBrowser();
-            const page = await browser.newPage();
-            const cleanup = async () => {
-                // We don't await this because we want to let it run in the background
-                // The afterEach hook for deployments already does this.
-                await cleanupDeployment(deployment);
-                await browser.close();
-            };
-            try {
-                await testFn({
-                    deployment,
-                    browser,
-                    page,
-                    url: deployment.url,
-                });
-                return { cleanup };
-            }
-            catch (error) {
-                throw Object.assign(error, { cleanup });
-            }
-        });
-    });
+export function testDeploy(...args) {
+    return createTestRunner(test.concurrent, "deploy")(...args);
 }
-/**
- * Skip version of testDeploy
- */
 testDeploy.skip = (name, testFn) => {
     test.skip(name, testFn || (() => { }));
 };
-testDeploy.only = (name, testFn) => {
-    if (SKIP_DEPLOYMENT_TESTS) {
-        test.skip(name, () => { });
-        return;
-    }
-    test.only(name, async () => {
-        await runTestWithRetries(name, async () => {
-            const deployment = await createDeployment();
-            const browser = await createBrowser();
-            const page = await browser.newPage();
-            const cleanup = async () => {
-                // We don't await this because we want to let it run in the background
-                // The afterEach hook for deployments already does this.
-                await cleanupDeployment(deployment);
-                await browser.close();
-            };
-            try {
-                await testFn({
-                    deployment,
-                    browser,
-                    page,
-                    url: deployment.url,
-                });
-                return { cleanup };
-            }
-            catch (error) {
-                throw Object.assign(error, { cleanup });
-            }
-        });
-    });
-};
+testDeploy.only = createTestRunner(test.only, "deploy");
 /**
  * Unified test function that runs the same test against both dev server and deployment.
  * Automatically skips based on environment variables.
@@ -475,22 +411,32 @@ testDevAndDeploy.only = (name, testFn) => {
     testDeploy.only(`${name} (deployment)`, testFn);
 };
 /**
- * Utility function for polling/retrying assertions
+ * Waits for the page to be fully loaded and hydrated.
+ * This should be used before any user interaction is simulated.
  */
-export async function poll(fn, timeout = 2 * 60 * 1000, // 2 minutes
-interval = 100) {
-    const startTime = Date.now();
-    while (Date.now() - startTime < timeout) {
-        try {
-            const result = await fn();
-            if (result) {
-                return;
-            }
-        }
-        catch (error) {
-            // Continue polling on errors
+export async function waitForHydration(page) {
+    // 1. Wait for the document to be fully loaded.
+    await page.waitForFunction('document.readyState === "complete"');
+    // 2. Wait a short, fixed amount of time for client-side hydration to finish.
+    // This is a pragmatic approach to ensure React has mounted.
+    await new Promise((resolve) => setTimeout(resolve, HYDRATION_TIMEOUT));
+}
+export function trackPageErrors(page) {
+    const consoleErrors = [];
+    const failedRequests = [];
+    page.on("requestfailed", (request) => {
+        failedRequests.push(`${request.url()} | ${request.failure()?.errorText}`);
+    });
+    page.on("console", (msg) => {
+        if (msg.type() === "error") {
+            consoleErrors.push(msg.text());
         }
-        await new Promise((resolve) => setTimeout(resolve, interval));
-    }
-    throw new Error(`Polling timed out after ${timeout}ms`);
+    });
+    return {
+        get: () => ({
+            // context(justinvdm, 25 Sep 2025): Filter out irrelevant 404s (e.g. favicon)
+            consoleErrors: consoleErrors.filter((e) => !e.includes("404")),
+            failedRequests,
+        }),
+    };
 }