@brillout/test-e2e 0.5.12 → 0.5.14

package/dist/Logs.d.ts

@@ -5,7 +5,7 @@ export declare const Logs: {
     logErrorsAndWarnings: typeof logErrorsAndWarnings;
     clearLogs: typeof clearLogs;
     hasFailLogs: typeof hasFailLogs;
-    logEagerly: "all" | "logs";
+    logEagerly: false | "all" | "logs";
 };
 export type { LogSource };
 declare type LogSource = 'stdout' | 'stderr' | 'Browser Error' | 'Browser Warning' | 'Browser Log' | 'Playwright' | 'run()' | 'run() failure' | 'test()' | 'Connection Error';

package/dist/Logs.js

@@ -10,7 +10,7 @@ exports.Logs = {
     logErrorsAndWarnings,
     clearLogs,
     hasFailLogs,
-    logEagerly: 'all',
+    logEagerly: false,
 };
 const utils_1 = require("./utils");
 const picocolors_1 = __importDefault(require("picocolors"));
@@ -83,13 +83,13 @@ function add({ logSource, logText, loggedAfterExit = false, }) {
 }
 function expectLog(logText, logFilter) {
     const logsFound = logEntries.filter((logEntry) => {
-        if ((0, strip_ansi_1.default)(logEntry.logText).includes(logText)) {
+        if (removeAnsi(logEntry).logText.includes(logText)) {
             logEntry.isNotFailure = true;
             return true;
         }
         return false;
     });
-    const logsFoundWithFilter = logsFound.filter((logEntry) => logFilter?.(logEntry));
+    const logsFoundWithFilter = logsFound.filter((logEntry) => logFilter?.(removeAnsi(logEntry)));
     if (logsFoundWithFilter.length === 0) {
         if (logsFound.length === 0) {
             throw new Error(`The following log was expected but wasn't logged: "${logText}"`);
@@ -100,6 +100,13 @@ function expectLog(logText, logFilter) {
     }
 }
 exports.expectLog = expectLog;
+function removeAnsi(logEntry) {
+    const logEntryWithoutAnsi = {
+        ...logEntry,
+        logText: (0, strip_ansi_1.default)(logEntry.logText),
+    };
+    return logEntryWithoutAnsi;
+}
 function getTimestamp() {
     const now = new Date();
     const time = now.toTimeString().split(' ')[0];

package/dist/getCurrentTest.js

@@ -9,7 +9,8 @@ const path_1 = __importDefault(require("path"));
 const TIMEOUTS_1 = require("./TIMEOUTS");
 let testInfo = null;
 function getCurrentTest() {
-    (0, utils_1.assert)(testInfo);
+    if (!testInfo)
+        throw new Error('testInfo missing');
     return testInfo;
 }
 exports.getCurrentTest = getCurrentTest;

package/dist/utils/cliConfig.js

@@ -6,6 +6,10 @@ const parseCli_1 = require("./parseCli");
 const verbose = (0, parseCli_1.check)('--verbose');
 const inspect = (0, parseCli_1.check)('--inspect');
 const debugEsbuild = (0, parseCli_1.check)('--debug-esbuild');
+/* Defined in ./findFiles.ts
+ * I don't think we use the --exclude option anymore? Can we remove it?
+const exclude = check('--exclude')
+*/
 (0, parseCli_1.validate)();
 const cliConfig = {
     verbose,

package/dist/utils/findFiles.js

@@ -35,15 +35,23 @@ function applyFilter(filePathRelative, findFilter) {
     }
     const { terms, exclude } = findFilter;
     for (const term of terms) {
-        if (!filePathRelative.includes(term) && !exclude) {
+        if (!matches(filePathRelative, term) && !exclude) {
             return false;
         }
-        if (filePathRelative.includes(term) && exclude) {
+        if (matches(filePathRelative, term) && exclude) {
             return false;
         }
     }
     return true;
 }
+function matches(str, chunk) {
+    str = normalize(str);
+    chunk = normalize(chunk);
+    return str.includes(chunk);
+}
+function normalize(p) {
+    return path_1.default.normalize(p);
+}
 function findFilesParseCliArgs() {
     const terms = [];
     let exclude = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.5.12",
+  "version": "0.5.14",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {