@lvce-editor/test-with-playwright-worker 22.40.5 → 22.40.7

package/dist/workerMain.js

@@ -1566,6 +1566,41 @@ const compareSvgScreenshot = async ({
   });
 };
 
+const formatConsoleMessage = (type, message) => {
+  const {
+    columnNumber,
+    lineNumber,
+    url
+  } = message.location();
+  const location = url ? ` (${url}:${lineNumber}:${columnNumber})` : '';
+  return `console ${type}: ${message.text()}${location}`;
+};
+const createPageMessages = page => {
+  const messages = [];
+  const onConsole = message => {
+    const type = message.type();
+    if (type === 'warning' || type === 'error') {
+      messages.push(formatConsoleMessage(type, message));
+    }
+  };
+  const onPageError = error => {
+    messages.push('uncaught page error: ' + (error.stack || error.message));
+  };
+  page.on('console', onConsole);
+  page.on('pageerror', onPageError);
+  return {
+    dispose: () => {
+      page.off('console', onConsole);
+      page.off('pageerror', onPageError);
+    },
+    messages
+  };
+};
+const formatPageMessages = messages => {
+  const formattedMessages = messages.map(message => '  ' + message).join('\n');
+  return `Browser console messages:\n${formattedMessages}`;
+};
+
 const Pass$1 = 1;
 const Skip$1 = 2;
 const Fail$1 = 3;
@@ -1594,6 +1629,7 @@ const withTimeout = async (promise, timeout) => {
 };
 const runElectronTest = async ({
   electronApp,
+  failOnConsoleMessages,
   page,
   svgScreenshotOptions,
   test,
@@ -1601,53 +1637,67 @@ const runElectronTest = async ({
   timeout
 }) => {
   const start = performance.now();
+  const pageMessages = failOnConsoleMessages ? createPageMessages(page) : undefined;
+  let result;
   try {
     const testModule = await importTestModule(testSrc, test);
     if (testModule.skip) {
       const end = performance.now();
-      return {
+      result = {
         end,
         error: '',
         name: test,
         start,
         status: Skip$1
       };
+    } else {
+      const {
+        expect
+      } = await import('@playwright/test');
+      await withTimeout(testModule.test({
+        electronApp,
+        expect,
+        Locator: page.locator.bind(page),
+        page
+      }), timeout);
+      if (svgScreenshotOptions) {
+        await captureSvgScreenshot({
+          options: svgScreenshotOptions,
+          page,
+          test
+        });
+      }
+      const end = performance.now();
+      result = {
+        end,
+        error: '',
+        name: test,
+        start,
+        status: Pass$1
+      };
     }
-    const {
-      expect
-    } = await import('@playwright/test');
-    await withTimeout(testModule.test({
-      electronApp,
-      expect,
-      Locator: page.locator.bind(page),
-      page
-    }), timeout);
-    if (svgScreenshotOptions) {
-      await captureSvgScreenshot({
-        options: svgScreenshotOptions,
-        page,
-        test
-      });
-    }
-    const end = performance.now();
-    return {
-      end,
-      error: '',
-      name: test,
-      start,
-      status: Pass$1
-    };
   } catch (error) {
     const end = performance.now();
     const message = error instanceof Error ? error.message : String(error);
-    return {
+    result = {
       end,
       error: message,
       name: test,
       start,
       status: Fail$1
     };
+  } finally {
+    pageMessages?.dispose();
+  }
+  if (pageMessages && pageMessages.messages.length > 0) {
+    const messages = formatPageMessages(pageMessages.messages);
+    result = {
+      ...result,
+      error: result.error ? `${result.error}\n${messages}` : messages,
+      status: Fail$1
+    };
   }
+  return result;
 };
 
 const getResultCounts$2 = status => {
@@ -1680,6 +1730,7 @@ const getResultCounts$2 = status => {
 };
 const runElectronTests = async ({
   electronApp,
+  failOnConsoleMessages,
   filter,
   onFinalResult,
   onResult,
@@ -1697,6 +1748,7 @@ const runElectronTests = async ({
   for (const test of filteredTests) {
     const result = await runElectronTest({
       electronApp,
+      failOnConsoleMessages,
       page,
       test,
       testSrc,
@@ -1775,6 +1827,7 @@ const navigateToTest = async (page, url, browser) => {
 };
 const runTest = async ({
   browser,
+  failOnConsoleMessages,
   page,
   port,
   svgScreenshotOptions,
@@ -1785,6 +1838,8 @@ const runTest = async ({
   traceRendererWorker
 }) => {
   const start = performance.now();
+  const pageMessages = failOnConsoleMessages ? createPageMessages(page) : undefined;
+  let result;
   try {
     const url = getUrlFromTestFile(test, port, traceFocus ?? false, traceRendererWorker ?? false);
     await navigateToTest(page, url, browser);
@@ -1805,7 +1860,7 @@ const runTest = async ({
       });
     }
     const end = performance.now();
-    return {
+    result = {
       // @ts-ignore
       ...testState,
       end,
@@ -1816,14 +1871,25 @@ const runTest = async ({
   } catch (error) {
     const end = performance.now();
     const message = error instanceof Error ? error.message : String(error);
-    return {
+    result = {
       end,
       error: message,
       name: test,
       start,
       status: Fail$1
     };
+  } finally {
+    pageMessages?.dispose();
+  }
+  if (pageMessages && pageMessages.messages.length > 0) {
+    const messages = formatPageMessages(pageMessages.messages);
+    result = {
+      ...result,
+      error: result.error ? `${result.error}\n${messages}` : messages,
+      status: Fail$1
+    };
   }
+  return result;
 };
 
 const getResultCounts$1 = status => {
@@ -1861,6 +1927,8 @@ const getResultCounts$1 = status => {
  */
 const runTests = async ({
   browser = 'chromium',
+  createPage,
+  failOnConsoleMessages,
   filter,
   headless,
   onFinalResult,
@@ -1881,32 +1949,39 @@ 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,
+        failOnConsoleMessages,
+        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({
@@ -2043,6 +2118,7 @@ const readTestResultsText = async (page, timeout) => {
 };
 const runTestsWithReusedPage = async ({
   browser,
+  failOnConsoleMessages,
   filter,
   onFinalResult,
   onResult,
@@ -2053,6 +2129,7 @@ const runTestsWithReusedPage = async ({
   traceFocus
 }) => {
   const start = performance.now();
+  const pageMessages = failOnConsoleMessages ? createPageMessages(page) : undefined;
   let results;
   try {
     const url = getAllTestsUrl(port, filter, traceFocus ?? false, rendererWorkerTraceDirectory !== undefined);
@@ -2065,12 +2142,25 @@ const runTestsWithReusedPage = async ({
   } catch (error) {
     results = [getFailedAllTestsResult(error, start)];
   }
-  if (rendererWorkerTraceDirectory) {
-    await exportTrace({
-      directory: rendererWorkerTraceDirectory,
-      page,
-      test: '_all.html'
-    });
+  try {
+    if (rendererWorkerTraceDirectory) {
+      await exportTrace({
+        directory: rendererWorkerTraceDirectory,
+        page,
+        test: '_all.html'
+      });
+    }
+  } finally {
+    pageMessages?.dispose();
+  }
+  if (pageMessages && pageMessages.messages.length > 0) {
+    results = [...results, {
+      end: performance.now(),
+      error: formatPageMessages(pageMessages.messages),
+      name: '_all.html (console messages)',
+      start,
+      status: Fail$1
+    }];
   }
   let failed = 0;
   let passed = 0;
@@ -2924,7 +3014,7 @@ const assertCoverageOptions = (coverageTarget, coverageInclude, coverageThreshol
  * @param {boolean} coverage
  * @param {boolean} traceRendererWorker
  */
-const runAllTests = async (extensionPath, testPath, cwd, browser, headless, timeout, runtimeOptions, traceFocus, filter, reusePage, svgScreenshotOptions, coverage, coverageInclude, coverageTarget, coverageThreshold, traceRendererWorker) => {
+const runAllTests = async (extensionPath, testPath, cwd, browser, headless, timeout, runtimeOptions, traceFocus, filter, reusePage, svgScreenshotOptions, coverage, coverageInclude, coverageTarget, coverageThreshold, traceRendererWorker, failOnConsoleMessages) => {
   string(extensionPath);
   string(testPath);
   string(cwd);
@@ -2936,6 +3026,7 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
   boolean(coverage);
   assertCoverageOptions(coverageTarget, coverageInclude, coverageThreshold);
   boolean(traceRendererWorker);
+  boolean(failOnConsoleMessages);
   if (svgScreenshotOptions !== undefined) {
     object(svgScreenshotOptions);
   }
@@ -2981,6 +3072,7 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
         await runElectronTests({
           ...filterOption,
           electronApp: electron.electronApp,
+          failOnConsoleMessages,
           onFinalResult,
           onResult,
           page: electron.page,
@@ -3035,6 +3127,7 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
           await runTestsWithReusedPage({
             browser,
             ...filterOption,
+            failOnConsoleMessages,
             onFinalResult,
             onResult,
             page,
@@ -3050,6 +3143,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,
@@ -3057,6 +3175,10 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
       run: async () => {
         await runTests({
           browser,
+          failOnConsoleMessages,
+          ...(createPage && {
+            createPage
+          }),
           ...filterOption,
           headless,
           onFinalResult,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-with-playwright-worker",
-  "version": "22.40.5",
+  "version": "22.40.7",
   "description": "Worker package for test-with-playwright",
   "repository": {
     "type": "git",
@@ -12,9 +12,9 @@
   "type": "module",
   "main": "dist/workerMain.js",
   "dependencies": {
-    "@playwright/test": "1.63.0",
+    "@playwright/test": "1.64.0",
     "get-port": "^7.2.0",
-    "playwright-core": "^1.63.0"
+    "playwright-core": "^1.64.0"
   },
   "engines": {
     "node": ">=24"