@brillout/test-e2e 0.6.8 → 0.6.10

package/dist/Logs.d.ts

@@ -12,6 +12,7 @@ type LogSource = 'stdout' | 'stderr' | 'Browser Error' | 'Browser Warning' | 'Br
 type LogEntry = {
     logSource: LogSource;
     logText: string;
+    logInfo: string;
     logTimestamp: string;
     isNotFailure: boolean;
     loggedAfterExit: boolean;
@@ -20,9 +21,10 @@ declare function hasFailLogs(failOnWarning: boolean): boolean;
 declare function clearLogs(): void;
 declare function logErrorsAndWarnings(): void;
 declare function flushLogs(): void;
-declare function add({ logSource, logText, loggedAfterExit, }: {
+declare function add({ logSource, logText, logInfo, loggedAfterExit, }: {
     logSource: LogSource;
     logText: string;
+    logInfo?: string;
     loggedAfterExit?: boolean;
 }): void;
 /**

package/dist/Logs.js

@@ -57,11 +57,12 @@ function flushLogs() {
     logEntries.filter((logEntry) => !logEntry.loggedAfterExit).forEach((logEntry) => printLog(logEntry));
     logEntries = [];
 }
-function add({ logSource, logText, loggedAfterExit = false, }) {
+function add({ logSource, logText, logInfo = '', loggedAfterExit = false, }) {
     const logTimestamp = getTimestamp();
     const logEntry = {
         logSource,
         logText,
+        logInfo,
         logTimestamp,
         isNotFailure: isTolerateError({ logSource, logText }),
         loggedAfterExit,

package/dist/getCurrentTest.d.ts

@@ -35,6 +35,7 @@ type TestInfo = {
     terminateServer?: () => Promise<void>;
     afterEach?: (hasFailed: boolean) => void;
     page?: Page;
+    aborted?: true;
 };
 declare function getCurrentTest(): TestInfo;
 declare function getCurrentTestOptional(): null | TestInfo;

package/dist/run.js

@@ -69,11 +69,12 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
     };
     return;
     // Also called when the page throws an error or a warning
-    function onConsole(msg) {
+    async function onConsole(msg) {
         const type = msg.type();
+        const isError = type === 'error';
         Logs.add({
             logSource: (() => {
-                if (type === 'error') {
+                if (isError) {
                     return 'Browser Error';
                 }
                 if (type === 'warning') {
@@ -81,16 +82,18 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
                 }
                 return 'Browser Log';
             })(),
-            logText: JSON.stringify({
+            logText: msg.text(),
+            logInfo: JSON.stringify({
                 type,
-                text: msg.text(),
                 location: msg.location(),
                 args: msg.args(),
             }, null, 2),
         });
+        if (isError)
+            await terminateUponBrowserError();
     }
     // For uncaught exceptions
-    function onPageError(err) {
+    async function onPageError(err) {
         Logs.add({
             logSource: 'Browser Error',
             logText: JSON.stringify({
@@ -98,6 +101,22 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
                 location: err.stack,
             }, null, 2),
         });
+        await terminateUponBrowserError();
+    }
+    async function terminateUponBrowserError() {
+        if (!cliOptions.bail)
+            return;
+        testInfo.aborted = true;
+        // Trick to abort the test: page.close() triggers the following error.
+        // ```console
+        // proxy.waitForFunction: Target closed
+        //     at clientSideNavigation (.testRun.ts:16:16)
+        //     at .testRun.ts:11:5
+        //     at file:///home/rom/code/test-e2e/src/runAll.ts:278:7 {
+        //   name: 'Error'
+        // }
+        // ```
+        await testInfo.page.close();
     }
 }
 async function startProcess({ serverIsReadyMessage, serverIsReadyDelay, additionalTimeout, cmd, }) {

package/dist/runAll.js

@@ -11,11 +11,15 @@ import { loadConfig } from './getConfig.js';
 import { logError } from './logError.js';
 import { hasFail, logBoot, logFail, logPass, logWarn, TEST_FAIL } from './logTestStatus.js';
 import pc from '@brillout/picocolors';
+let browser;
 async function runAll(filter) {
     await loadConfig();
     const testFiles = await findTestFiles(filter);
-    const browser = await getBrowser();
+    browser = await getBrowser();
     const failedTestFiles = await runTestFiles(testFiles, browser);
+    await closeAll(failedTestFiles);
+}
+async function closeAll(failedTestFiles) {
     await browser.close();
     const hasFailedTestFile = failedTestFiles.length > 0;
     const hasFailLog = hasFail();
@@ -134,8 +138,11 @@ async function runServerAndTests(browser, isThirdAttempt, isFlaky) {
         return false;
     }
     let success = await runTests(testInfo, isFinalAttempt);
+    return await closeTest(testInfo, success, isFinalAttempt);
+}
+async function closeTest(testInfo, success, isFinalAttempt) {
     await testInfo.terminateServer();
-    await page.close();
+    await testInfo.page.close();
     // Check whether stderr emitted during testInfo.terminateServer()
     if (success) {
         const failOnWarning = true;
@@ -181,7 +188,7 @@ async function runTests(testInfo, isFinalAttempt) {
             const hasErrorLog = Logs.hasFailLogs(failOnWarning);
             const isFailure = err || hasErrorLog;
             if (isFailure) {
-                if (err) {
+                if (err && !testInfo.aborted) {
                     logFailure(err, `the test "${testDesc}" threw an error`, isFinalAttempt);
                 }
                 else if (hasErrorLog) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "type": "module",