@brillout/test-e2e 0.6.11 → 0.6.13

package/dist/Logs.d.ts

@@ -4,7 +4,7 @@ export declare const Logs: {
     flushLogs: typeof flushLogs;
     logErrorsAndWarnings: typeof logErrorsAndWarnings;
     clearLogs: typeof clearLogs;
-    hasFailLogs: typeof hasFailLogs;
+    hasFailureLog: typeof hasFailureLog;
     logEagerly: false | "all" | "logs";
 };
 export type { LogSource };
@@ -17,7 +17,10 @@ type LogEntry = {
     isNotFailure: boolean;
     loggedAfterExit: boolean;
 };
-declare function hasFailLogs(failOnWarning: boolean): boolean;
+declare function hasFailureLog({ includeBrowserWarnings, includeStderr, }: {
+    includeBrowserWarnings: boolean;
+    includeStderr: boolean;
+}): boolean;
 declare function clearLogs(): void;
 declare function logErrorsAndWarnings(): void;
 declare function flushLogs(): void;

package/dist/Logs.js

@@ -4,10 +4,10 @@ export const Logs = {
     flushLogs,
     logErrorsAndWarnings,
     clearLogs,
-    hasFailLogs,
+    hasFailureLog,
     logEagerly: false,
 };
-import { assert, cliOptions, ensureNewTerminalLine, isWindows } from './utils.js';
+import { assert, cliOptions, ensureNewTerminalLine, isCI, isWindows } from './utils.js';
 import pc from '@brillout/picocolors';
 import { getCurrentTest, getCurrentTestOptional } from './getCurrentTest.js';
 import { logSection } from './logSection.js';
@@ -15,11 +15,11 @@ import { isTolerateError } from './Logs/isTolerateError.js';
 import stripAnsi from 'strip-ansi';
 let logEntries = [];
 const logEntriesAll = [];
-function hasFailLogs(failOnWarning) {
-    const failLogs = getErrorLogs(failOnWarning);
+function hasFailureLog({ includeBrowserWarnings, includeStderr, }) {
+    const failLogs = getErrorLogs({ includeBrowserWarnings, includeStderr });
     return failLogs.length > 0;
 }
-function getErrorLogs(includeWarnings) {
+function getErrorLogs({ includeBrowserWarnings, includeStderr, }) {
     const errorLogs = logEntries.filter((logEntry) => {
         if (logEntry.isNotFailure) {
             return false;
@@ -32,7 +32,10 @@ function getErrorLogs(includeWarnings) {
         if (logSource === 'run() failure') {
             return true;
         }
-        if (includeWarnings && (logSource === 'Browser Warning' || logSource === 'stderr')) {
+        if (logSource === 'Browser Warning' && includeBrowserWarnings) {
+            return true;
+        }
+        if (logSource === 'stderr' && includeStderr) {
             return true;
         }
         if (logSource === 'Browser Error') {
@@ -46,7 +49,7 @@ function clearLogs() {
     logEntries = [];
 }
 function logErrorsAndWarnings() {
-    const errorAndWarningLogs = getErrorLogs(true);
+    const errorAndWarningLogs = getErrorLogs({ includeBrowserWarnings: true, includeStderr: true });
     if (errorAndWarningLogs.length === 0)
         return;
     logSection('ERROR & WARNING LOGS');
@@ -59,12 +62,13 @@ function flushLogs() {
 }
 function add({ logSource, logText, logInfo = '', loggedAfterExit = false, }) {
     const logTimestamp = getTimestamp();
+    const isNotFailure = isTolerateError({ logSource, logText });
     const logEntry = {
         logSource,
         logText,
         logInfo,
         logTimestamp,
-        isNotFailure: isTolerateError({ logSource, logText }),
+        isNotFailure,
         loggedAfterExit,
     };
     logEntries.push(logEntry);
@@ -78,15 +82,20 @@ function add({ logSource, logText, logInfo = '', loggedAfterExit = false, }) {
         if (shouldLog)
             printLog(logEntry);
     }
-    if (logSource === 'Browser Error' || logSource === 'stderr') {
-        terminateUponErrorLog();
+    if ((logSource === 'Browser Error' || logSource === 'stderr') && !isNotFailure) {
+        terminateUponErrorLog(logSource);
     }
 }
-async function terminateUponErrorLog() {
-    if (!cliOptions.bail)
+async function terminateUponErrorLog(logSource) {
+    const shouldBail = cliOptions.bail || (logSource === 'Browser Error' && !isCI());
+    if (!shouldBail)
         return;
     const testInfo = getCurrentTest();
+    // Skip bailing upon stderr logs while spinning up the server
+    if (logSource === 'stderr' && !testInfo.isTestFunctionRunning)
+        return;
     testInfo.aborted = true;
+    assert(Logs.hasFailureLog({ includeBrowserWarnings: false, includeStderr: true }));
     // Trick to abort the test: page.close() triggers the following error.
     // ```console
     // proxy.waitForFunction: Target closed
@@ -97,6 +106,10 @@ async function terminateUponErrorLog() {
     // }
     // ```
     await testInfo.page.close();
+    /* The trick above doesn't always work, and the following doesn't seem to make a difference.
+    const browser = await getBrowser()
+    await browser.close()
+    */
 }
 /**
  * Expect a log to be printed.

package/dist/getCurrentTest.d.ts

@@ -10,6 +10,7 @@ import type { Page } from 'playwright-chromium';
 type TestInfo = {
     testFile: string;
     testName: string;
+    isTestFunctionRunning?: true;
     tests?: {
         testDesc: string;
         testFn: Function;

package/dist/run.js

@@ -93,10 +93,8 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
     function onPageError(err) {
         Logs.add({
             logSource: 'Browser Error',
-            logText: JSON.stringify({
-                text: err.message,
-                location: err.stack,
-            }, null, 2),
+            logText: err.stack || err.message,
+            logInfo: JSON.stringify({ errorMessage: err.message }, null, 2),
         });
     }
 }

package/dist/runAll.js

@@ -11,15 +11,14 @@ 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);
-    browser = await getBrowser();
+    const browser = await getBrowser();
     const failedTestFiles = await runTestFiles(testFiles, browser);
-    await closeAll(failedTestFiles);
+    await closeAll(failedTestFiles, browser);
 }
-async function closeAll(failedTestFiles) {
+async function closeAll(failedTestFiles, browser) {
     await browser.close();
     const hasFailedTestFile = failedTestFiles.length > 0;
     const hasFailLog = hasFail();
@@ -42,7 +41,7 @@ async function runTestFiles(testFiles, browser) {
             if (!isFlaky) {
                 doNotRetry = true;
             }
-            if (cliOptions.bail) {
+            if (cliOptions.bail || !isCI()) {
                 return failedTestFiles;
             }
         }
@@ -146,7 +145,7 @@ async function closeTest(testInfo, success, isFinalAttempt) {
     // Check whether stderr emitted during testInfo.terminateServer()
     if (success) {
         const failOnWarning = true;
-        if (Logs.hasFailLogs(failOnWarning) &&
+        if (Logs.hasFailureLog({ includeBrowserWarnings: failOnWarning, includeStderr: failOnWarning }) &&
             // See comments about taskkill in src/utils/runCommandLongRunning.ts
             !isWindows()) {
             logFailure(null, `${getErrorType(failOnWarning)} occurred during server termination`, isFinalAttempt);
@@ -169,6 +168,7 @@ async function runTests(testInfo, isFinalAttempt) {
         // When user hasn't any test() call
         [];
     for (const { testDesc, testFn } of tests) {
+        testInfo.isTestFunctionRunning = true;
         Logs.add({
             logSource: 'test()',
             logText: testDesc,
@@ -185,23 +185,38 @@ async function runTests(testInfo, isFinalAttempt) {
         testInfo.afterEach(!!err);
         {
             const failOnWarning = !testInfo.runInfo.doNotFailOnWarning;
-            const hasErrorLog = Logs.hasFailLogs(failOnWarning);
-            const isFailure = err || hasErrorLog;
+            const isFailureFromLogs = Logs.hasFailureLog({
+                includeBrowserWarnings: failOnWarning,
+                includeStderr: failOnWarning,
+            });
+            const isFailure = err || isFailureFromLogs;
             if (isFailure) {
-                if (err && !testInfo.aborted) {
+                if (err &&
+                    // When aborting (using the page.close() trick) the following `err` is triggered which irrelevant for the user.
+                    // ```
+                    // proxy.goto: Target page, context or browser has been closed
+                    //    at .testRun.ts:21:16
+                    //    at runTest (file:///home/rom/code/test-e2e/src/runAll.ts:265:24)
+                    //    at runTests (file:///home/rom/code/test-e2e/src/runAll.ts:211:13)
+                    //    at runServerAndTests (file:///home/rom/code/test-e2e/src/runAll.ts:164:17)
+                    //    at buildAndTest (file:///home/rom/code/test-e2e/src/runAll.ts:142:19)
+                    //    at runTestFiles (file:///home/rom/code/test-e2e/src/runAll.ts:56:34)
+                    //    at runAll (file:///home/rom/code/test-e2e/src/runAll.ts:26:27) {
+                    //  name: 'Error'
+                    //}
+                    !testInfo.aborted) {
                     logFailure(err, `the test "${testDesc}" threw an error`, isFinalAttempt);
                 }
-                else if (hasErrorLog) {
-                    logFailure(null, `${getErrorType(failOnWarning)} occurred while running the test "${testDesc}"`, isFinalAttempt);
-                }
                 else {
-                    assert(false);
+                    assert(Logs.hasFailureLog({ includeBrowserWarnings: failOnWarning, includeStderr: true }));
+                    logFailure(null, `${getErrorType(failOnWarning)} occurred while running the test "${testDesc}"`, isFinalAttempt);
                 }
                 return false;
             }
         }
         Logs.clearLogs();
     }
+    delete testInfo.isTestFunctionRunning;
     return true;
 }
 function logFailure(err, reason, isFinalAttempt) {

package/dist/utils/cliOptions.js

@@ -1,11 +1,10 @@
 export { cliOptions };
 import { check, prepare, validate } from './parseCli.js';
-import { isCI } from './platform.js';
 prepare();
 const verbose = check('--verbose');
 const inspect = check('--inspect');
 const debugEsbuild = check('--debug-esbuild');
-const bail = check('--bail') || !isCI();
+const bail = check('--bail');
 // Defined & used in ./findFiles.ts
 const exclude = check('--exclude');
 validate();

package/package.json

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