@brillout/test-e2e 0.5.9 → 0.5.11

package/dist/Logs/isTolerateError.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTolerateError = void 0;
 const getConfig_1 = require("../getConfig");
+const strip_ansi_1 = __importDefault(require("strip-ansi"));
 function isTolerateError({ logSource, logText }) {
+    logText = (0, strip_ansi_1.default)(logText);
     if (tolerateError({ logSource, logText })) {
         return true;
     }

package/dist/Logs.d.ts

@@ -1,11 +1,11 @@
-export { expectError };
+export { expectLog };
 export declare const Logs: {
     add: typeof add;
     flushLogs: typeof flushLogs;
     logErrorsAndWarnings: typeof logErrorsAndWarnings;
     clearLogs: typeof clearLogs;
     hasFailLogs: typeof hasFailLogs;
-    logEagerly: boolean;
+    logEagerly: "all" | "logs";
 };
 export type { LogSource };
 declare type LogSource = 'stdout' | 'stderr' | 'Browser Error' | 'Browser Warning' | 'Browser Log' | 'Playwright' | 'run()' | 'run() failure' | 'test()' | 'Connection Error';
@@ -25,4 +25,4 @@ declare function add({ logSource, logText, loggedAfterExit, }: {
     logText: string;
     loggedAfterExit?: boolean;
 }): void;
-declare function expectError(userFilter: (logEntry: LogEntry) => boolean): void;
+declare function expectLog(logText: string, logFilter?: (logEntry: LogEntry) => boolean): void;

package/dist/Logs.js

@@ -3,21 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logs = exports.expectError = void 0;
+exports.Logs = exports.expectLog = void 0;
 exports.Logs = {
     add,
     flushLogs,
     logErrorsAndWarnings,
     clearLogs,
     hasFailLogs,
-    logEagerly: false,
+    logEagerly: 'all',
 };
 const utils_1 = require("./utils");
 const picocolors_1 = __importDefault(require("picocolors"));
 const getCurrentTest_1 = require("./getCurrentTest");
 const logSection_1 = require("./logSection");
 const isTolerateError_1 = require("./Logs/isTolerateError");
-const expect_1 = require("./chai/expect");
+const strip_ansi_1 = __importDefault(require("strip-ansi"));
 let logEntries = [];
 function hasFailLogs(failOnWarning) {
     const failLogs = getErrorLogs(failOnWarning);
@@ -72,20 +72,34 @@ function add({ logSource, logText, loggedAfterExit = false, }) {
     };
     logEntries.push(logEntry);
     if (exports.Logs.logEagerly) {
-        printLog(logEntry);
+        let shouldLog = false;
+        if (exports.Logs.logEagerly === 'all')
+            shouldLog = true;
+        if (exports.Logs.logEagerly === 'logs' && logSource !== 'Playwright')
+            shouldLog = true;
+        if (shouldLog)
+            printLog(logEntry);
     }
 }
-function expectError(userFilter) {
-    const logFounds = logEntries.filter((logEntry) => {
-        if (userFilter(logEntry)) {
+function expectLog(logText, logFilter) {
+    const logsFound = logEntries.filter((logEntry) => {
+        if ((0, strip_ansi_1.default)(logEntry.logText).includes(logText)) {
             logEntry.isNotFailure = true;
             return true;
         }
         return false;
     });
-    (0, expect_1.expect)(logFounds.length).not.toBe(0);
+    const logsFoundWithFilter = logsFound.filter((logEntry) => logFilter?.(logEntry));
+    if (logsFoundWithFilter.length === 0) {
+        if (logsFound.length === 0) {
+            throw new Error(`The following log was expected but wasn't logged: "${logText}"`);
+        }
+        else {
+            throw new Error(`The following log was logged as expected, but it didn't match the logFilter() you provided`);
+        }
+    }
 }
-exports.expectError = expectError;
+exports.expectLog = expectLog;
 function getTimestamp() {
     const now = new Date();
     const time = now.toTimeString().split(' ')[0];

package/dist/fetch.d.ts

@@ -0,0 +1,5 @@
+export { fetch };
+export { fetchHtml };
+import fetch_ from 'node-fetch';
+declare function fetchHtml(pathname: string): Promise<string>;
+declare function fetch(...args: Parameters<typeof fetch_>): Promise<import("node-fetch").Response>;

package/dist/fetch.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchHtml = exports.fetch = void 0;
+const getCurrentTest_1 = require("./getCurrentTest");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const Logs_1 = require("./Logs");
+async function fetchHtml(pathname) {
+    const response = await fetch((0, getCurrentTest_1.getServerUrl)() + pathname);
+    const html = await response.text();
+    return html;
+}
+exports.fetchHtml = fetchHtml;
+async function fetch(...args) {
+    try {
+        return await (0, node_fetch_1.default)(...args);
+    }
+    catch (err) {
+        Logs_1.Logs.add({
+            logSource: 'Connection Error',
+            logText: `Couldn't connect to \`${args[0]}\`. Args: \`${JSON.stringify(args.slice(1))}\`. Err: \`${
+            // @ts-ignore
+            err.message}\``,
+        });
+        throw new Error("Couldn't connect to server. See `Connection Error` log for more details.");
+    }
+}
+exports.fetch = fetch;

package/dist/getCurrentTest.d.ts

@@ -4,6 +4,7 @@ export { setCurrentTest };
 export { getRunInfo };
 export { setRunInfo };
 export { getCwd };
+export { getServerUrl };
 export type { TestInfo };
 import type { Page } from 'playwright-chromium';
 declare type TestInfo = {
@@ -55,3 +56,4 @@ declare function setRunInfo({ cmd, serverUrl, additionalTimeout, doNotFailOnWarn
     isRunCommandThatTerminates?: boolean;
 }): void;
 declare function getCwd(): string;
+declare function getServerUrl(): string;

package/dist/getCurrentTest.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCwd = exports.setRunInfo = exports.getRunInfo = exports.setCurrentTest = exports.getCurrentTestOptional = exports.getCurrentTest = void 0;
+exports.getServerUrl = exports.getCwd = exports.setRunInfo = exports.getRunInfo = exports.setCurrentTest = exports.getCurrentTestOptional = exports.getCurrentTest = void 0;
 const utils_1 = require("./utils");
 const path_1 = __importDefault(require("path"));
 const TIMEOUTS_1 = require("./TIMEOUTS");
@@ -69,3 +69,9 @@ function getCwd() {
     return cwd;
 }
 exports.getCwd = getCwd;
+function getServerUrl() {
+    const testInfo = getCurrentTest();
+    const serverUrl = testInfo.runInfo?.serverUrl;
+    return serverUrl;
+}
+exports.getServerUrl = getServerUrl;

package/dist/index.d.ts

@@ -1,6 +1,14 @@
-export * from './setup';
 export { expect } from './chai/expect';
 export { test } from './test';
 export { page } from './page';
 export { editFile, editFileRevert } from './editFile';
 export { testScreenshotFixture } from './testScreenshotFixture';
+export { partRegex } from '@brillout/part-regex';
+export { autoRetry } from './autoRetry';
+export { fetch, fetchHtml } from './fetch';
+export { expectLog } from './Logs';
+export { run } from './run';
+export { skip } from './skip';
+export { isMinNodeVersion, isCI, isLinux, isWindows, isMac, sleep } from './utils';
+export { getServerUrl } from './getCurrentTest';
+export { runCommandThatTerminates } from './runCommandThatTerminates';

package/dist/index.js

@@ -1,21 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testScreenshotFixture = exports.editFileRevert = exports.editFile = exports.page = exports.test = exports.expect = void 0;
-__exportStar(require("./setup"), exports);
+exports.runCommandThatTerminates = exports.getServerUrl = exports.sleep = exports.isMac = exports.isWindows = exports.isLinux = exports.isCI = exports.isMinNodeVersion = exports.skip = exports.run = exports.expectLog = exports.fetchHtml = exports.fetch = exports.autoRetry = exports.partRegex = exports.testScreenshotFixture = exports.editFileRevert = exports.editFile = exports.page = exports.test = exports.expect = void 0;
 var expect_1 = require("./chai/expect");
 Object.defineProperty(exports, "expect", { enumerable: true, get: function () { return expect_1.expect; } });
 var test_1 = require("./test");
@@ -27,3 +12,27 @@ Object.defineProperty(exports, "editFile", { enumerable: true, get: function ()
 Object.defineProperty(exports, "editFileRevert", { enumerable: true, get: function () { return editFile_1.editFileRevert; } });
 var testScreenshotFixture_1 = require("./testScreenshotFixture");
 Object.defineProperty(exports, "testScreenshotFixture", { enumerable: true, get: function () { return testScreenshotFixture_1.testScreenshotFixture; } });
+var part_regex_1 = require("@brillout/part-regex");
+Object.defineProperty(exports, "partRegex", { enumerable: true, get: function () { return part_regex_1.partRegex; } });
+var autoRetry_1 = require("./autoRetry");
+Object.defineProperty(exports, "autoRetry", { enumerable: true, get: function () { return autoRetry_1.autoRetry; } });
+var fetch_1 = require("./fetch");
+Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return fetch_1.fetch; } });
+Object.defineProperty(exports, "fetchHtml", { enumerable: true, get: function () { return fetch_1.fetchHtml; } });
+var Logs_1 = require("./Logs");
+Object.defineProperty(exports, "expectLog", { enumerable: true, get: function () { return Logs_1.expectLog; } });
+var run_1 = require("./run");
+Object.defineProperty(exports, "run", { enumerable: true, get: function () { return run_1.run; } });
+var skip_1 = require("./skip");
+Object.defineProperty(exports, "skip", { enumerable: true, get: function () { return skip_1.skip; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "isMinNodeVersion", { enumerable: true, get: function () { return utils_1.isMinNodeVersion; } });
+Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return utils_1.isCI; } });
+Object.defineProperty(exports, "isLinux", { enumerable: true, get: function () { return utils_1.isLinux; } });
+Object.defineProperty(exports, "isWindows", { enumerable: true, get: function () { return utils_1.isWindows; } });
+Object.defineProperty(exports, "isMac", { enumerable: true, get: function () { return utils_1.isMac; } });
+Object.defineProperty(exports, "sleep", { enumerable: true, get: function () { return utils_1.sleep; } });
+var getCurrentTest_1 = require("./getCurrentTest");
+Object.defineProperty(exports, "getServerUrl", { enumerable: true, get: function () { return getCurrentTest_1.getServerUrl; } });
+var runCommandThatTerminates_1 = require("./runCommandThatTerminates");
+Object.defineProperty(exports, "runCommandThatTerminates", { enumerable: true, get: function () { return runCommandThatTerminates_1.runCommandThatTerminates; } });

package/dist/page.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.page = void 0;
-const utils_1 = require("./utils");
 const getCurrentTest_1 = require("./getCurrentTest");
 const page = new Proxy({}, {
     get(_, prop) {
         const { page } = (0, getCurrentTest_1.getCurrentTest)();
-        (0, utils_1.assert)(page);
+        if (!page)
+            throw new Error("`page` isn't available. Make sure to access `page` only inside test() calls. In particular, if test() is async, then make sure to await all asynchronous code executed by your async test().");
         return page[prop];
     },
 });

package/dist/run.d.ts

@@ -0,0 +1,12 @@
+export { run };
+declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, }?: {
+    additionalTimeout?: number;
+    serverIsReadyMessage?: string | ((log: string) => boolean);
+    serverIsReadyDelay?: number;
+    inspect?: boolean;
+    /** deprecated */
+    cwd?: string;
+    doNotFailOnWarning?: boolean;
+    serverUrl?: string;
+    isFlaky?: boolean;
+}): void;

package/dist/{setup.js → run.js}

@@ -1,35 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommandThatTerminates = exports.getServerUrl = exports.sleep = exports.isMac = exports.isWindows = exports.isLinux = exports.isCI = exports.isMinNodeVersion = exports.skip = exports.run = exports.expectError = exports.fetch = exports.fetchHtml = exports.autoRetry = exports.partRegex = void 0;
-var part_regex_1 = require("@brillout/part-regex");
-Object.defineProperty(exports, "partRegex", { enumerable: true, get: function () { return part_regex_1.partRegex; } });
-var autoRetry_1 = require("./autoRetry");
-Object.defineProperty(exports, "autoRetry", { enumerable: true, get: function () { return autoRetry_1.autoRetry; } });
-var Logs_1 = require("./Logs");
-Object.defineProperty(exports, "expectError", { enumerable: true, get: function () { return Logs_1.expectError; } });
-var runCommandThatTerminates_1 = require("./runCommandThatTerminates");
-Object.defineProperty(exports, "runCommandThatTerminates", { enumerable: true, get: function () { return runCommandThatTerminates_1.runCommandThatTerminates; } });
+exports.run = void 0;
 const utils_1 = require("./utils");
-Object.defineProperty(exports, "sleep", { enumerable: true, get: function () { return utils_1.sleep; } });
-Object.defineProperty(exports, "isWindows", { enumerable: true, get: function () { return utils_1.isWindows; } });
-Object.defineProperty(exports, "isLinux", { enumerable: true, get: function () { return utils_1.isLinux; } });
-Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return utils_1.isCI; } });
-Object.defineProperty(exports, "isMac", { enumerable: true, get: function () { return utils_1.isMac; } });
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const utils_2 = require("./utils");
-const Logs_2 = require("./Logs");
+const Logs_1 = require("./Logs");
 const editFile_1 = require("./editFile");
 const getCurrentTest_1 = require("./getCurrentTest");
 const page_1 = require("./page");
 const TIMEOUTS_1 = require("./TIMEOUTS");
-function skip(reason) {
-    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    testInfo.skipped = { reason };
-}
-exports.skip = skip;
 function run(cmd, { 
 //baseUrl = '',
 additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = utils_1.cliConfig.inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, } = {}) {
@@ -43,7 +21,10 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
         isFlaky,
     });
     if (inspect) {
-        Logs_2.Logs.logEagerly = true;
+        Logs_1.Logs.logEagerly = 'all';
+    }
+    else if (utils_1.cliConfig.verbose) {
+        Logs_1.Logs.logEagerly = 'logs';
     }
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     let runProcess = null;
@@ -77,7 +58,7 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
         }
     };
     testInfo.terminateServer = async () => {
-        Logs_2.Logs.add({
+        Logs_1.Logs.add({
             logSource: 'run()',
             logText: 'Terminate server.',
         });
@@ -92,7 +73,7 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
     // Also called when the page throws an error or a warning
     function onConsole(msg) {
         const type = msg.type();
-        Logs_2.Logs.add({
+        Logs_1.Logs.add({
             logSource: (() => {
                 if (type === 'error') {
                     return 'Browser Error';
@@ -112,7 +93,7 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
     }
     // For uncaught exceptions
     function onPageError(err) {
-        Logs_2.Logs.add({
+        Logs_1.Logs.add({
             logSource: 'Browser Error',
             logText: JSON.stringify({
                 text: err.message,
@@ -136,7 +117,7 @@ async function startProcess({ serverIsReadyMessage, serverIsReadyDelay, addition
             return serverIsReady;
         };
     }
-    Logs_2.Logs.add({
+    Logs_1.Logs.add({
         logSource: 'run()',
         logText: `Spawn command \`${cmd}\``,
     });
@@ -148,14 +129,14 @@ async function startProcess({ serverIsReadyMessage, serverIsReadyDelay, addition
         isReadyTimeout: TIMEOUTS_1.TIMEOUT_NPM_SCRIPT + additionalTimeout,
         killPort: process.env.CI || !(0, utils_1.isLinux)() ? false : getServerPort(),
         onStderr(data, { loggedAfterExit }) {
-            Logs_2.Logs.add({
+            Logs_1.Logs.add({
                 logSource: 'stderr',
                 logText: data,
                 loggedAfterExit,
             });
         },
         onStdout(data, { loggedAfterExit }) {
-            Logs_2.Logs.add({
+            Logs_1.Logs.add({
                 logSource: 'stdout',
                 logText: data,
                 loggedAfterExit,
@@ -163,20 +144,20 @@ async function startProcess({ serverIsReadyMessage, serverIsReadyDelay, addition
         },
         onExit(errMsg) {
             if (!errMsg) {
-                Logs_2.Logs.add({
+                Logs_1.Logs.add({
                     logSource: 'run()',
                     logText: `Process termination (expected)`,
                 });
             }
             else {
-                Logs_2.Logs.add({
+                Logs_1.Logs.add({
                     logSource: 'run() failure',
                     logText: errMsg,
                 });
             }
         },
         onTerminationError(errMsg) {
-            Logs_2.Logs.add({
+            Logs_1.Logs.add({
                 logSource: 'run() failure',
                 logText: errMsg,
             });
@@ -194,69 +175,15 @@ async function startProcess({ serverIsReadyMessage, serverIsReadyDelay, addition
     done(!!err);
     if (err)
         throw err;
-    Logs_2.Logs.add({
+    Logs_1.Logs.add({
         logSource: 'run()',
         logText: 'Server is ready.',
     });
     await (0, utils_1.sleep)(serverIsReadyDelay);
     return { terminate };
 }
-async function fetchHtml(pathname) {
-    const response = await fetch(getServerUrl() + pathname);
-    const html = await response.text();
-    return html;
-}
-exports.fetchHtml = fetchHtml;
-async function fetch(...args) {
-    try {
-        return await (0, node_fetch_1.default)(...args);
-    }
-    catch (err) {
-        Logs_2.Logs.add({
-            logSource: 'Connection Error',
-            logText: `Couldn't connect to \`${args[0]}\`. Args: \`${JSON.stringify(args.slice(1))}\`. Err: \`${
-            // @ts-ignore
-            err.message}\``,
-        });
-        throw new Error("Couldn't connect to server. See `Connection Error` log for more details.");
-    }
-}
-exports.fetch = fetch;
-/*
-async function bailOnTimeout(asyncFunc: () => Promise<void>, { timeout }: { timeout: number }) {
-  let resolve: () => void
-  let reject: (err: Error) => void
-  const promise = new Promise<void>((_resolve, _reject) => {
-    resolve = _resolve
-    reject = _reject
-  })
-
-  const t = setTimeout(() => {
-    reject(new Error(`Function timeout.`))
-  }, timeout)
-  await asyncFunc()
-  clearTimeout(t)
-  resolve()
-
-  return promise
-}
-*/
-function isMinNodeVersion(minNodeVersion) {
-    const { version } = process;
-    (0, utils_2.assert)(version.startsWith('v'));
-    const major = parseInt(version[1] + version[2], 10);
-    (0, utils_2.assert)(12 <= major && major <= 50);
-    return major >= minNodeVersion;
-}
-exports.isMinNodeVersion = isMinNodeVersion;
-function getServerUrl() {
-    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    const serverUrl = testInfo.runInfo?.serverUrl;
-    return serverUrl;
-}
-exports.getServerUrl = getServerUrl;
 function getServerPort() {
-    const serverUrl = getServerUrl();
+    const serverUrl = (0, getCurrentTest_1.getServerUrl)();
     const portStr = serverUrl.split(':').slice(-1)[0].split('/')[0];
     (0, utils_2.assert)(/\d+/.test(portStr), { serverUrl });
     const port = parseInt(portStr, 10);

package/dist/runAll.js

@@ -27,7 +27,7 @@ async function runAll(filter) {
         (0, utils_1.assert)(hasFailedTestFile && hasFailLog);
         (0, utils_1.assert)(failedTestFiles.length > 0);
         throw new Error([
-            'Following test files failed, see all the logs printed above for more information.',
+            'Following test files failed, see logs above for more information.',
             ...failedTestFiles.map((testFile) => `  ${testFile}`),
         ].join('\n'));
     }
@@ -76,17 +76,23 @@ async function buildAndTest(testFile, browser, isSecondAttempt) {
         (0, logError_1.logError)(execErr);
         return false;
     }
-    // When user calls run runCommandThatTerminates()
-    {
-        const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    // When user calls skip()
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    if (testInfo.skipped) {
+        assertSkipUsage(testInfo);
+        (0, logTestStatus_1.logWarn)(testInfo.skipped.reason);
+        return true;
+    }
+    else {
         // Set when user calls run() or runCommandThatTerminates()
         (0, utils_1.assert)(testInfo.runInfo);
-        if (testInfo.runInfo.isRunCommandThatTerminates) {
-            (0, utils_1.assertUsage)(!testInfo.tests, "Can't call test() when calling runCommandThatTerminates()");
-            (0, utils_1.assertUsage)(!testInfo.startServer, "Can't call run() when calling runCommandThatTerminates()");
-            (0, logTestStatus_1.logPass)();
-            return true;
-        }
+    }
+    // When user calls run runCommandThatTerminates()
+    if (testInfo.runInfo.isRunCommandThatTerminates) {
+        (0, utils_1.assertUsage)(!testInfo.tests, "Can't call test() when calling runCommandThatTerminates()");
+        (0, utils_1.assertUsage)(!testInfo.startServer, "Can't call run() when calling runCommandThatTerminates()");
+        (0, logTestStatus_1.logPass)();
+        return true;
     }
     const success = await runServerAndTests(browser, isSecondAttempt);
     (0, getCurrentTest_2.setCurrentTest)(null);
@@ -94,12 +100,6 @@ async function buildAndTest(testFile, browser, isSecondAttempt) {
 }
 async function runServerAndTests(browser, isSecondAttempt) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    // Set when user calls skip()
-    if (testInfo.skipped) {
-        assertSkipUsage(testInfo);
-        (0, logTestStatus_1.logWarn)(testInfo.skipped.reason);
-        return true;
-    }
     // Set when user calls run()
     (0, utils_1.assert)(testInfo.runInfo);
     (0, utils_1.assert)(testInfo.startServer);
@@ -127,7 +127,7 @@ async function runServerAndTests(browser, isSecondAttempt) {
     if (success) {
         const failOnWarning = true;
         if (Logs_1.Logs.hasFailLogs(failOnWarning) &&
-            // See comments about taskkill in src/setup.ts
+            // See comments about taskkill in src/utils/runCommandLongRunning.ts
             !(0, utils_1.isWindows)()) {
             logFailure(null, `${getErrorType(failOnWarning)} occurred during server termination`, isFinalAttempt);
             success = false;

package/dist/skip.d.ts

@@ -0,0 +1,2 @@
+export { skip };
+declare function skip(reason: string): void;

package/dist/skip.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.skip = void 0;
+const getCurrentTest_1 = require("./getCurrentTest");
+function skip(reason) {
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    testInfo.skipped = { reason };
+}
+exports.skip = skip;

package/dist/utils/cliConfig.d.ts

@@ -1,4 +1,6 @@
-export declare const cliConfig: {
-    debugEsbuild: boolean;
+export { cliConfig };
+declare const cliConfig: {
+    verbose: boolean;
     inspect: boolean;
+    debugEsbuild: boolean;
 };

package/dist/utils/cliConfig.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cliConfig = void 0;
-const cliArgs = process.argv.slice(2);
-exports.cliConfig = {
-    debugEsbuild: cliArgs.includes('--debug-esbuild'),
+const parseCli_1 = require("./parseCli");
+(0, parseCli_1.prepare)();
+const verbose = (0, parseCli_1.check)('--verbose');
+const inspect = (0, parseCli_1.check)('--inspect');
+const debugEsbuild = (0, parseCli_1.check)('--debug-esbuild');
+(0, parseCli_1.validate)();
+const cliConfig = {
+    verbose,
     // To inspect a specific test: `$ touch examples/some-example/INSPECT`
-    inspect: cliArgs.includes('--inspect') || !!process.env.TEST_INSPECT,
+    inspect: inspect || !!process.env.TEST_INSPECT,
+    debugEsbuild,
 };
+exports.cliConfig = cliConfig;

package/dist/utils/index.d.ts

@@ -12,3 +12,4 @@ export * from './fsWindowsBugWorkaround';
 export * from './isObject';
 export * from './isCallable';
 export * from './platform';
+export * from './isMinNodeVersion';

package/dist/utils/index.js

@@ -28,3 +28,4 @@ __exportStar(require("./fsWindowsBugWorkaround"), exports);
 __exportStar(require("./isObject"), exports);
 __exportStar(require("./isCallable"), exports);
 __exportStar(require("./platform"), exports);
+__exportStar(require("./isMinNodeVersion"), exports);

package/dist/utils/isMinNodeVersion.d.ts

@@ -0,0 +1,2 @@
+export { isMinNodeVersion };
+declare function isMinNodeVersion(minNodeVersion: 14): boolean;

package/dist/utils/isMinNodeVersion.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMinNodeVersion = void 0;
+const assert_1 = require("./assert");
+function isMinNodeVersion(minNodeVersion) {
+    const { version } = process;
+    (0, assert_1.assert)(version.startsWith('v'));
+    const major = parseInt(version[1] + version[2], 10);
+    (0, assert_1.assert)(12 <= major && major <= 50);
+    return major >= minNodeVersion;
+}
+exports.isMinNodeVersion = isMinNodeVersion;

package/dist/utils/parseCli.d.ts

@@ -0,0 +1,6 @@
+export { prepare };
+export { check };
+export { validate };
+declare function prepare(): void;
+declare function check(option: string): boolean;
+declare function validate(): void;

package/dist/utils/parseCli.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validate = exports.check = exports.prepare = void 0;
+let optionList;
+const optionsKnown = [];
+function prepare() {
+    optionList = process.argv.filter((w) => w.startsWith('--'));
+}
+exports.prepare = prepare;
+function check(option) {
+    optionsKnown.push(option);
+    const val = optionList.includes(option);
+    if (val)
+        optionList = optionList.filter((s) => s !== option);
+    return val;
+}
+exports.check = check;
+function validate() {
+    if (optionList.length > 0) {
+        throw new Error([
+            // prettier-ignore
+            `unknown options: ${optionList.join(' ')}`,
+            `known options: ${optionsKnown.join(' ')}`,
+        ].join('\n'));
+    }
+}
+exports.validate = validate;

package/package.json

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

package/dist/setup.d.ts

@@ -1,33 +0,0 @@
-export { partRegex } from '@brillout/part-regex';
-export { autoRetry } from './autoRetry';
-export { fetchHtml };
-export { fetch };
-export { expectError } from './Logs';
-export { run };
-export { skip };
-export { isMinNodeVersion };
-export { isCI };
-export { isLinux };
-export { isWindows };
-export { isMac };
-export { sleep };
-export { getServerUrl };
-export { runCommandThatTerminates } from './runCommandThatTerminates';
-import { sleep, isWindows, isLinux, isCI, isMac } from './utils';
-import fetch_ from 'node-fetch';
-declare function skip(reason: string): void;
-declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, }?: {
-    additionalTimeout?: number;
-    serverIsReadyMessage?: string | ((log: string) => boolean);
-    serverIsReadyDelay?: number;
-    inspect?: boolean;
-    /** deprecated */
-    cwd?: string;
-    doNotFailOnWarning?: boolean;
-    serverUrl?: string;
-    isFlaky?: boolean;
-}): void;
-declare function fetchHtml(pathname: string): Promise<string>;
-declare function fetch(...args: Parameters<typeof fetch_>): Promise<import("node-fetch").Response>;
-declare function isMinNodeVersion(minNodeVersion: 14): boolean;
-declare function getServerUrl(): string;