@brillout/test-e2e 0.6.18 → 0.6.20

package/dist/Logs.js

@@ -20,31 +20,32 @@ function hasFailureLog({ includeBrowserWarnings, includeStderr, }) {
     return failLogs.length > 0;
 }
 function getErrorLogs({ includeBrowserWarnings, includeStderr, }) {
-    const errorLogs = logEntries.filter((logEntry) => {
-        if (logEntry.isNotFailure) {
-            return false;
-        }
-        const { logSource } = logEntry;
-        // taskkill makes process exit with exit code `1` which makes npm emit logs on stderr
-        if (logEntry.loggedAfterExit && isWindows() && logSource === 'stderr') {
-            return false;
-        }
-        if (logSource === 'run() failure') {
-            return true;
-        }
-        if (logSource === 'Browser Warning' && includeBrowserWarnings) {
-            return true;
-        }
-        if (logSource === 'stderr' && includeStderr) {
-            return true;
-        }
-        if (logSource === 'Browser Error') {
-            return true;
-        }
-        return false;
-    });
+    const errorLogs = logEntries.filter((logEntry) => isErrorLog(logEntry, { includeBrowserWarnings, includeStderr }));
     return errorLogs;
 }
+function isErrorLog(logEntry, { includeBrowserWarnings = true, includeStderr = true, } = {}) {
+    if (logEntry.isNotFailure) {
+        return false;
+    }
+    const { logSource } = logEntry;
+    // taskkill makes process exit with exit code `1` which makes npm emit logs on stderr
+    if (logEntry.loggedAfterExit && isWindows() && logSource === 'stderr') {
+        return false;
+    }
+    if (logSource === 'run() failure') {
+        return true;
+    }
+    if (logSource === 'Browser Warning' && includeBrowserWarnings) {
+        return true;
+    }
+    if (logSource === 'stderr' && includeStderr) {
+        return true;
+    }
+    if (logSource === 'Browser Error') {
+        return true;
+    }
+    return false;
+}
 function clearLogs() {
     logEntries = [];
 }
@@ -153,24 +154,28 @@ function getTimestamp() {
     return timestamp;
 }
 function printLog(logEntry) {
-    const { logSource, logText, logTimestamp } = logEntry;
-    let logSourceLabel = colorize(logSource);
+    const { logSource, logText, logTimestamp, logInfo } = logEntry;
     const testInfo = getCurrentTestOptional();
     // See https://github.com/nodejs/node/issues/8033#issuecomment-388323687
     if (!ensureNewTerminalLine()) {
         console.log('');
     }
+    // msg
     let msg = logText;
     // I don't know why but sometimes `logText` is `undefined`
     if (msg === undefined)
         msg = '';
     // Some logs seem have a trailing new line
     msg = msg.trim();
+    if (logInfo && isErrorLog(logEntry))
+        msg += '\n' + logInfo.trim();
+    // testInfoLabels
     let testInfoLabels = '';
     if (testInfo) {
         assert(testInfo.runInfo, testInfo);
         testInfoLabels = `[${testInfo.testName}][${testInfo.runInfo.cmd}]`;
     }
+    const logSourceLabel = colorize(logSource);
     console.log(`[${logTimestamp}]${testInfoLabels}[${logSourceLabel}] ${msg}`);
 }
 function colorize(logSource) {

package/dist/run.js

@@ -71,30 +71,36 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
     // Also called when the page throws an error or a warning
     function onConsole(msg) {
         const type = msg.type();
+        let showType = false;
+        const logSource = (() => {
+            if (type === 'error') {
+                return 'Browser Error';
+            }
+            if (type === 'warning') {
+                return 'Browser Warning';
+            }
+            showType = true;
+            return 'Browser Log';
+        })();
+        const logInfo = {
+            location: msg.location(),
+            args: msg.args(),
+        };
+        if (showType)
+            Object.assign(logInfo, { type });
         Logs.add({
-            logSource: (() => {
-                if (type === 'error') {
-                    return 'Browser Error';
-                }
-                if (type === 'warning') {
-                    return 'Browser Warning';
-                }
-                return 'Browser Log';
-            })(),
+            logSource,
             logText: msg.text(),
-            logInfo: JSON.stringify({
-                type,
-                location: msg.location(),
-                args: msg.args(),
-            }, null, 2),
+            logInfo: JSON.stringify(logInfo, null, 2),
         });
     }
     // For uncaught exceptions
     function onPageError(err) {
+        const logText = err.stack || err.message;
+        assert(logText.includes(err.message));
         Logs.add({
             logSource: 'Browser Error',
-            logText: err.stack || err.message,
-            logInfo: JSON.stringify({ errorMessage: err.message }, null, 2),
+            logText,
         });
     }
 }
@@ -108,7 +114,7 @@ async function startProcess({ serverIsReadyMessage, serverIsReadyDelay, addition
                 // npm package `serve`
                 log.includes('Accepting connections at') ||
                 // Vite
-                (log.includes('Local:') && log.includes('http://localhost:3000/'));
+                (log.includes('Local:') && log.includes('http://localhost:3000'));
             return serverIsReady;
         };
     }

package/package.json

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