@lvce-editor/test-with-playwright-worker 22.40.4 → 22.40.6

package/dist/workerMain.js

@@ -1786,13 +1786,11 @@ const runTest = async ({
 }) => {
   const start = performance.now();
   try {
-    const {
-      expect
-    } = await import('@playwright/test');
     const url = getUrlFromTestFile(test, port, traceFocus ?? false, traceRendererWorker ?? false);
     await navigateToTest(page, url, browser);
     const testOverlay = page.locator('#TestOverlay');
-    await expect(testOverlay).toBeVisible({
+    await testOverlay.waitFor({
+      state: 'visible',
       timeout
     });
     const text = await testOverlay.textContent();
@@ -1863,6 +1861,7 @@ const getResultCounts$1 = status => {
  */
 const runTests = async ({
   browser = 'chromium',
+  createPage,
   filter,
   headless,
   onFinalResult,
@@ -1883,32 +1882,38 @@ const runTests = async ({
   // Filter tests if a filter is provided
   const filteredTests = filter ? tests.filter(test => test.includes(filter)) : tests;
   for (const test of filteredTests) {
-    const result = await runTest({
-      browser,
-      page,
-      port,
-      test,
-      testSrc,
-      timeout,
-      traceFocus: traceFocus ?? false,
-      traceRendererWorker: rendererWorkerTraceDirectory !== undefined,
-      ...(svgScreenshotOptions && {
-        svgScreenshotOptions
-      })
-    });
-    if (rendererWorkerTraceDirectory) {
-      await exportTrace({
-        directory: rendererWorkerTraceDirectory,
-        page,
-        test
+    const testPage = await createPage?.();
+    const currentPage = testPage?.page ?? page;
+    try {
+      const result = await runTest({
+        browser,
+        page: currentPage,
+        port,
+        test,
+        testSrc,
+        timeout,
+        traceFocus: traceFocus ?? false,
+        traceRendererWorker: rendererWorkerTraceDirectory !== undefined,
+        ...(svgScreenshotOptions && {
+          svgScreenshotOptions
+        })
       });
+      if (rendererWorkerTraceDirectory) {
+        await exportTrace({
+          directory: rendererWorkerTraceDirectory,
+          page: currentPage,
+          test
+        });
+      }
+      await onResult(result);
+      // @ts-ignore
+      const resultCounts = getResultCounts$1(result.status);
+      failed += resultCounts.failed;
+      passed += resultCounts.passed;
+      skipped += resultCounts.skipped;
+    } finally {
+      await testPage?.dispose();
     }
-    await onResult(result);
-    // @ts-ignore
-    const resultCounts = getResultCounts$1(result.status);
-    failed += resultCounts.failed;
-    passed += resultCounts.passed;
-    skipped += resultCounts.skipped;
   }
   const end = performance.now();
   await onFinalResult({
@@ -3052,6 +3057,31 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
       return;
     }
     const tests = await getTests(testSrc);
+    let initialBrowserAvailable = true;
+    const createPage = browser === 'webkit' ? async () => {
+      signal.throwIfAborted();
+      if (initialBrowserAvailable) {
+        initialBrowserAvailable = false;
+        return {
+          dispose,
+          page
+        };
+      }
+      const nextBrowser = await startBrowser({
+        browser,
+        headless,
+        signal
+      });
+      try {
+        if (traceRendererWorker) {
+          await nextBrowser.page.addInitScript(install);
+        }
+        return nextBrowser;
+      } catch (error) {
+        await nextBrowser.dispose();
+        throw error;
+      }
+    } : undefined;
     await runWithJavascriptCoverage({
       coverage,
       cwd,
@@ -3059,6 +3089,9 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
       run: async () => {
         await runTests({
           browser,
+          ...(createPage && {
+            createPage
+          }),
           ...filterOption,
           headless,
           onFinalResult,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-with-playwright-worker",
-  "version": "22.40.4",
+  "version": "22.40.6",
   "description": "Worker package for test-with-playwright",
   "repository": {
     "type": "git",