@brillout/test-e2e 0.1.4 → 0.1.6

package/dist/Logs.d.ts

@@ -6,24 +6,18 @@ export declare const Logs: {
     getBrowserErrors: typeof getBrowserErrors;
     flushEagerly: boolean;
 };
-declare type LogType = 'stdout' | 'stderr' | 'Browser Error' | 'Browser Log' | 'Run Start' | 'Jest' | 'process' | 'Connection Error';
-declare type TestContext = null | {
-    testName: string;
-    cmd: string;
-};
+declare type LogSource = 'stdout' | 'stderr' | 'Browser Error' | 'Browser Log' | 'Playwright' | 'run()' | 'test()' | 'Connection Error';
 declare type LogEntry = {
-    logType: LogType;
+    logSource: LogSource;
     logText: string;
     logTimestamp: string;
-    testContext: TestContext;
     isExpectedError: boolean;
 };
 declare function getBrowserErrors(): LogEntry[];
 declare function clear(): void;
 declare function flush(): void;
-declare function add({ logType, logText, testContext }: {
-    logType: LogType;
+declare function add({ logSource, logText }: {
+    logSource: LogSource;
     logText: string;
-    testContext: TestContext;
 }): void;
 declare function expectBrowserError(browserLogFilter: (browserLog: LogEntry) => boolean): void;

package/dist/Logs.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logs = exports.expectBrowserError = void 0;
 exports.Logs = {
@@ -9,11 +12,12 @@ exports.Logs = {
     flushEagerly: false,
 };
 const utils_1 = require("./utils");
-const picocolors_1 = require("picocolors");
+const picocolors_1 = __importDefault(require("picocolors"));
+const getCurrentTest_1 = require("./getCurrentTest");
 let logEntries = [];
 let logEntriesNotPrinted = [];
 function getBrowserErrors() {
-    return logEntries.filter(({ logType, isExpectedError }) => logType === 'Browser Error' && !isExpectedError);
+    return logEntries.filter(({ logSource, isExpectedError }) => logSource === 'Browser Error' && !isExpectedError);
 }
 function clear() {
     logEntries = [];
@@ -23,12 +27,11 @@ function flush() {
     logEntriesNotPrinted.forEach((logEntry) => printLog(logEntry));
     logEntriesNotPrinted = [];
 }
-function add({ logType, logText, testContext }) {
+function add({ logSource, logText }) {
     const logTimestamp = getTimestamp();
     const logEntry = {
-        logType,
+        logSource,
         logText,
-        testContext,
         logTimestamp,
         isExpectedError: false,
     };
@@ -58,20 +61,35 @@ function getTimestamp() {
     return timestamp;
 }
 function printLog(logEntry) {
-    const { logType, logText, logTimestamp, testContext } = logEntry;
-    let prefix = logType;
-    if (logType === 'stderr' || logType === 'Browser Error')
-        prefix = (0, picocolors_1.bold)((0, picocolors_1.red)(logType));
-    if (logType === 'stdout' || logType === 'Browser Log')
-        prefix = (0, picocolors_1.bold)((0, picocolors_1.blue)(logType));
+    const { logSource, logText, logTimestamp } = logEntry;
+    let logSourceLabel = colorize(logSource);
+    const testInfo = (0, getCurrentTest_1.getCurrentTestOptional)();
+    // See https://github.com/nodejs/node/issues/8033#issuecomment-388323687
+    if (!(0, utils_1.ensureNewTerminalLine)()) {
+        process.stderr.write(`\n`);
+    }
     let msg = logText;
-    if (!msg)
-        msg = ''; // don't know why but sometimes `logText` is `undefined`
+    // I don't know why but sometimes `logText` is `undefined`
+    if (msg === undefined)
+        msg = '';
     if (!msg.endsWith('\n'))
         msg = msg + '\n';
-    if (testContext) {
-        const { testName, cmd } = testContext;
-        msg = `[${testName}][${cmd}] ${msg}`;
+    let testInfoLabels = '';
+    if (testInfo) {
+        (0, utils_1.assert)(testInfo.runInfo);
+        testInfoLabels = `[${testInfo.testName}][${testInfo.runInfo.cmd}]`;
     }
-    process.stderr.write(`[${logTimestamp}][${prefix}]${msg}`);
+    process.stderr.write(`[${logTimestamp}]${testInfoLabels}[${logSourceLabel}] ${msg}`);
+}
+function colorize(logSource) {
+    const { bold } = picocolors_1.default;
+    if (logSource === 'stderr' || logSource === 'Browser Error' || logSource === 'Connection Error')
+        return bold(picocolors_1.default.red(logSource));
+    if (logSource === 'stdout' || logSource === 'Browser Log')
+        return bold(picocolors_1.default.blue(logSource));
+    if (logSource === 'Playwright')
+        return bold(picocolors_1.default.magenta(logSource));
+    if (logSource === 'run()' || logSource === 'test()')
+        return bold(picocolors_1.default.yellow(logSource));
+    (0, utils_1.assert)(false);
 }

package/dist/buildTs.d.ts

@@ -1,2 +1,2 @@
 export { buildTs };
-declare function buildTs(entry: string, outfile: string): Promise<void>;
+declare function buildTs(entry: string, outfile: string): Promise<() => void>;

package/dist/buildTs.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildTs = void 0;
 const esbuild_1 = __importDefault(require("esbuild"));
+const fs_1 = __importDefault(require("fs"));
+const utils_1 = require("./utils");
 async function buildTs(entry, outfile) {
     await esbuild_1.default.build({
         platform: 'node',
@@ -18,5 +20,13 @@ async function buildTs(entry, outfile) {
         external: ['./node_modules/*', '@brillout/test-e2e'],
         minify: false,
     });
+    const clean = () => {
+        if (utils_1.cliConfig.debugEsbuild) {
+            return;
+        }
+        fs_1.default.unlinkSync(`${outfile}`);
+        fs_1.default.unlinkSync(`${outfile}.map`);
+    };
+    return clean;
 }
 exports.buildTs = buildTs;

package/dist/chai/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="chai-subset" />
 export type { ChaiPlugin };
 export type { Expect };
 import type { use as chaiUse } from 'chai';

package/dist/cli.js

@@ -2,38 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 require("source-map-support/register");
+const utils_1 = require("./utils");
 const runTestSuites_1 = require("./runTestSuites");
 initPromiseRejectionHandler();
 cli();
 function cli() {
-    const { filter, debug } = parseArgs();
-    (0, runTestSuites_1.runTestSuites)({ filter, debug });
-}
-function parseArgs() {
-    let debug = false;
-    const terms = [];
-    let exclude = false;
-    process.argv.slice(2).forEach((arg) => {
-        if (arg === '--debug') {
-            debug = true;
-        }
-        else if (arg === '--exclude') {
-            exclude = true;
-        }
-        else {
-            terms.push(arg);
-        }
-    });
-    const filter = terms.length === 0
-        ? null
-        : {
-            terms,
-            exclude,
-        };
-    return {
-        filter,
-        debug,
-    };
+    const filter = (0, utils_1.findFilesParseCliArgs)();
+    (0, runTestSuites_1.runTestSuites)(filter);
 }
 function initPromiseRejectionHandler() {
     process.on('unhandledRejection', function (err) {

package/dist/editFile.js

@@ -7,7 +7,7 @@ exports.editFileAssertReverted = exports.editFileRevert = exports.editFile = voi
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
-const getTestInfo_1 = require("./getTestInfo");
+const getCurrentTest_1 = require("./getCurrentTest");
 const filesContentOriginal = {};
 function editFile(filePathRelative, replacer) {
     const filePath = getFilePath(filePathRelative);
@@ -42,7 +42,7 @@ function editFileAssertReverted() {
 }
 exports.editFileAssertReverted = editFileAssertReverted;
 function getFilePath(filePathRelative) {
-    const { testFile } = (0, getTestInfo_1.getTestInfo)();
+    const { testFile } = (0, getCurrentTest_1.getCurrentTest)();
     const cwd = path_1.default.dirname(testFile);
     const filePath = require.resolve(filePathRelative, { paths: [cwd] });
     return filePath;

package/dist/getBrowser.js

@@ -2,12 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBrowser = void 0;
 const playwright_chromium_1 = require("playwright-chromium");
+const Logs_1 = require("./Logs");
 const utils_1 = require("./utils");
 let browser;
 async function getBrowser() {
     if (!browser) {
         const done = (0, utils_1.logProgress)('Launch Browser');
-        browser = await playwright_chromium_1.chromium.launch({ headless: true });
+        browser = await playwright_chromium_1.chromium.launch({
+            headless: true,
+            logger: {
+                isEnabled: () => true,
+                log: (name, _severity, message, args, _hint, ...rest) => {
+                    (0, utils_1.assert)(args.length === 0);
+                    (0, utils_1.assert)(rest.length === 0);
+                    Logs_1.Logs.add({
+                        logSource: 'Playwright',
+                        logText: `${name} ${message}`,
+                    });
+                },
+            },
+        });
         done();
     }
     return browser;

package/dist/getCurrentTest.d.ts

@@ -0,0 +1,30 @@
+export { getCurrentTest };
+export { getCurrentTestOptional };
+export { setCurrentTest };
+import type { Page } from 'playwright-chromium';
+declare type TestInfo = {
+    testFile: string;
+    testName: string;
+    tests?: {
+        testDesc: string;
+        testFn: Function;
+    }[];
+    runInfo?: {
+        cmd: string;
+        cwd: string;
+        testTimeout: number;
+        additionalTimeout: number;
+        serverIsReadyMessage?: string;
+        serverIsReadyDelay: number;
+        debug: boolean;
+    };
+    hasStartedRunning?: boolean;
+    skipped?: string;
+    startServer?: () => Promise<void>;
+    terminateServer?: () => Promise<void>;
+    afterEach?: (hasFailed: boolean) => void;
+    page?: Page;
+};
+declare function getCurrentTest(): TestInfo;
+declare function getCurrentTestOptional(): null | TestInfo;
+declare function setCurrentTest(testFile: null | string): void;

package/dist/getCurrentTest.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setCurrentTest = exports.getCurrentTestOptional = exports.getCurrentTest = void 0;
+const utils_1 = require("./utils");
+const path_1 = __importDefault(require("path"));
+let testInfo = null;
+function getCurrentTest() {
+    (0, utils_1.assert)(testInfo);
+    return testInfo;
+}
+exports.getCurrentTest = getCurrentTest;
+function getCurrentTestOptional() {
+    return testInfo;
+}
+exports.getCurrentTestOptional = getCurrentTestOptional;
+function setCurrentTest(testFile) {
+    if (testFile) {
+        testInfo = {
+            testFile,
+            testName: getTestName(testFile),
+        };
+    }
+    else {
+        testInfo = null;
+    }
+}
+exports.setCurrentTest = setCurrentTest;
+function getTestName(testFile) {
+    const pathRelative = removeRootDir(testFile);
+    if (testFile.includes('examples')) {
+        return path_1.default.dirname(pathRelative);
+    }
+    else {
+        return pathRelative;
+    }
+}
+function removeRootDir(filePath) {
+    const rootDir = process.cwd();
+    (0, utils_1.assert)(filePath.startsWith(rootDir));
+    return filePath.slice(rootDir.length);
+}

package/dist/page.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.page = void 0;
 const utils_1 = require("./utils");
-const getTestInfo_1 = require("./getTestInfo");
+const getCurrentTest_1 = require("./getCurrentTest");
 const page = new Proxy({}, {
     get(_, prop) {
-        const { page } = (0, getTestInfo_1.getTestInfo)();
+        const { page } = (0, getCurrentTest_1.getCurrentTest)();
         (0, utils_1.assert)(page);
         return page[prop];
     },

package/dist/runTestSuites.d.ts

@@ -1,6 +1,3 @@
 export { runTestSuites };
 import { FindFilter } from './utils';
-declare function runTestSuites({ filter, debug }: {
-    filter: null | FindFilter;
-    debug: boolean;
-}): Promise<void>;
+declare function runTestSuites(filter: null | FindFilter): Promise<void>;

package/dist/runTestSuites.js

@@ -1,35 +1,28 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTestSuites = void 0;
 const utils_1 = require("./utils");
-const fs_1 = __importDefault(require("fs"));
-const getTestInfo_1 = require("./getTestInfo");
+const getCurrentTest_1 = require("./getCurrentTest");
 const runTests_1 = require("./runTests");
 const getBrowser_1 = require("./getBrowser");
 const buildTs_1 = require("./buildTs");
 const findTestFiles_1 = require("./findTestFiles");
-async function runTestSuites({ filter, debug }) {
+async function runTestSuites(filter) {
     const testFiles = await (0, findTestFiles_1.findTestFiles)(filter);
     const browser = await (0, getBrowser_1.getBrowser)();
     for (const testFile of testFiles) {
         (0, utils_1.assert)(testFile.endsWith('.ts'));
         const testFileJs = testFile.replace('.ts', '.mjs');
-        await (0, buildTs_1.buildTs)(testFile, testFileJs);
-        (0, getTestInfo_1.setTestInfo)({ testFile });
+        const clean = await (0, buildTs_1.buildTs)(testFile, testFileJs);
+        (0, getCurrentTest_1.setCurrentTest)(testFile);
         try {
             await import(workaroundBug(testFileJs));
-            await (0, runTests_1.runTests)(browser);
         }
         finally {
-            if (!debug) {
-                fs_1.default.unlinkSync(`${testFileJs}`);
-                fs_1.default.unlinkSync(`${testFileJs}.map`);
-            }
+            clean();
         }
-        (0, getTestInfo_1.setTestInfo)(null);
+        await (0, runTests_1.runTests)(browser);
+        (0, getCurrentTest_1.setCurrentTest)(null);
         (0, utils_1.assert)(testFileJs.endsWith('.mjs'));
     }
     await browser.close();

package/dist/runTests.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTests = void 0;
-const getTestInfo_1 = require("./getTestInfo");
+const getCurrentTest_1 = require("./getCurrentTest");
 const Logs_1 = require("./Logs");
 const utils_1 = require("./utils");
-const expect_1 = require("./chai/expect");
 const picocolors_1 = require("picocolors");
 async function runTests(browser) {
-    const testInfo = (0, getTestInfo_1.getTestInfo)();
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     if (utils_1.isTTY) {
         console.log();
         console.log(testInfo.testFile);
@@ -16,25 +15,37 @@ async function runTests(browser) {
     testInfo.page = page;
     // Set when user calls `skip()`
     if (testInfo.skipped) {
-        (0, utils_1.assertUsage)(!testInfo.runWasCalled, 'You cannot call `run()` after calling `skip()`');
+        (0, utils_1.assertUsage)(!testInfo.runInfo, 'You cannot call `run()` after calling `skip()`');
         (0, utils_1.assertUsage)(testInfo.tests === undefined, 'You cannot call `test()` after calling `skip()`');
         logTestsResult(false);
         return;
     }
     // Set when user calls `run()`
-    (0, utils_1.assert)(testInfo.runWasCalled);
-    (0, utils_1.assert)(testInfo.beforeAll);
-    (0, utils_1.assert)(testInfo.afterAll);
+    (0, utils_1.assert)(testInfo.runInfo);
+    (0, utils_1.assert)(testInfo.startServer);
+    (0, utils_1.assert)(testInfo.terminateServer);
     (0, utils_1.assert)(testInfo.afterEach);
-    (0, utils_1.assert)(testInfo.testTimeout);
     // Set when user calls `test()`
     (0, utils_1.assert)(testInfo.tests);
-    await testInfo.beforeAll();
+    // TODO: resolve a success flag instead rejecting
+    try {
+        await testInfo.startServer();
+    }
+    catch (err) {
+        console.log(err);
+        Logs_1.Logs.flush();
+        logTestsResult(false);
+        process.exit(1);
+    }
     for (const { testDesc, testFn } of testInfo.tests) {
+        Logs_1.Logs.add({
+            logSource: 'test()',
+            logText: testDesc,
+        });
         const done = (0, utils_1.logProgress)(` | [test] ${testDesc}`);
         let err;
         try {
-            await runTest(testFn, testInfo.testTimeout);
+            await runTest(testFn, testInfo.runInfo.testTimeout);
         }
         catch (err_) {
             err = err_;
@@ -42,27 +53,24 @@ async function runTests(browser) {
         done(!!err);
         testInfo.afterEach(!!err);
         const browserErrors = Logs_1.Logs.getBrowserErrors();
-        const isFailure = err || browserErrors.length > 0;
-        if (isFailure) {
-            Logs_1.Logs.flush();
-        }
-        Logs_1.Logs.clear();
+        const browserThrewError = browserErrors.length > 0;
+        const isFailure = err || browserThrewError;
         if (isFailure) {
-            logTestsResult(false);
-            if (browserErrors.length === 0) {
-                throw err;
+            if (err) {
+                console.error(err);
             }
-            else {
-                if (err) {
-                    console.error(err);
-                }
-                // Display all browser errors
-                (0, expect_1.expect)(browserErrors).deep.equal([]);
-                (0, utils_1.assert)(false);
+            if (browserThrewError) {
+                console.log(new Error('The browser threw one or more error'));
             }
+            Logs_1.Logs.flush();
+            logTestsResult(false);
+            process.exit(1);
+        }
+        else {
+            Logs_1.Logs.clear();
         }
     }
-    await testInfo.afterAll();
+    await testInfo.terminateServer();
     await page.close();
     logTestsResult(true);
 }
@@ -75,7 +83,7 @@ function runTest(testFn, testTimeout) {
         reject = reject_;
     });
     const timeout = setTimeout(() => {
-        reject(new Error(`[test][timeout after ${(0, utils_1.humanizeTime)(testTimeout)}]`));
+        reject(new Error(`[test] Timeout after ${(0, utils_1.humanizeTime)(testTimeout)}`));
     }, testTimeout);
     const ret = testFn();
     (async () => {
@@ -93,7 +101,7 @@ function runTest(testFn, testTimeout) {
     return promise;
 }
 function logTestsResult(success) {
-    const testInfo = (0, getTestInfo_1.getTestInfo)();
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     const passStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgGreen)(t));
     const failStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgRed)(t));
     const skipStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgYellow)(t));

package/dist/setup.js

@@ -13,7 +13,7 @@ const utils_2 = require("./utils");
 const Logs_1 = require("./Logs");
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
 const editFile_1 = require("./editFile");
-const getTestInfo_1 = require("./getTestInfo");
+const getCurrentTest_1 = require("./getCurrentTest");
 const page_1 = require("./page");
 var part_regex_1 = require("@brillout/part-regex");
 Object.defineProperty(exports, "partRegex", { enumerable: true, get: function () { return part_regex_1.partRegex; } });
@@ -31,45 +31,30 @@ const TIMEOUT_AUTORETRY = 10 * 1000 * (!isGithubAction() || isLinux() ? 1 : 20);
 const TIMEOUT_PROCESS_TERMINATION = 10 * 1000 * (!isGithubAction() ? 1 : isLinux() ? 1 : 4);
 const TIMEOUT_PLAYWRIGHT = TIMEOUT_JEST;
 function skip(reason) {
-    const testInfo = (0, getTestInfo_1.getTestInfo)();
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     testInfo.skipped = reason;
 }
 exports.skip = skip;
 function run(cmd, { 
 //baseUrl = '',
-additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, debug = !!process.env.DEBUG, cwd, } = {}) {
+additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, debug = utils_1.cliConfig.debug, cwd, } = {}) {
     additionalTimeout += serverIsReadyDelay;
-    const testInfo = (0, getTestInfo_1.getTestInfo)();
-    testInfo.runWasCalled = true;
-    testInfo.testCmd = cmd;
-    testInfo.testTimeout = TIMEOUT_JEST + additionalTimeout;
-    /*
-    const browser = await getBrowser()
-    const page = await browser.newPage()
-    testInfo.page = page
-  
-    const { page } = testInfo
-    // Set by `./runTests`
-    assert(page)
-    */
-    if (debug) {
-        Logs_1.Logs.flushEagerly = true;
-    }
-    const testContext = {
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    testInfo.runInfo = {
         cmd,
         cwd: cwd || getCwd(),
-        testName: getTestName(),
         additionalTimeout,
+        testTimeout: TIMEOUT_JEST + additionalTimeout,
         serverIsReadyMessage,
         serverIsReadyDelay,
         debug,
     };
-    logJestStep('run start');
+    if (debug) {
+        Logs_1.Logs.flushEagerly = true;
+    }
     let runProcess = null;
-    testInfo.beforeAll = async () => {
-        logJestStep('beforeAll start');
-        runProcess = await start(testContext);
-        logJestStep('run done');
+    testInfo.startServer = async () => {
+        runProcess = await start();
         page_1.page.on('console', onConsole);
         page_1.page.on('pageerror', onPageError);
         // This setting will change the default maximum time for all the methods accepting timeout option.
@@ -83,7 +68,6 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, debug =
           { timeout: TIMEOUT_PAGE_LOAD + additionalTimeout },
         )
         */
-        logJestStep('beforeAll end');
     };
     testInfo.afterEach = (hasFailed) => {
         if (!hasFailed) {
@@ -93,63 +77,58 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, debug =
             (0, editFile_1.editFileRevert)();
         }
     };
-    testInfo.afterAll = async () => {
-        logJestStep('afterAll start');
+    testInfo.terminateServer = async () => {
         page_1.page.off('console', onConsole);
         page_1.page.off('pageerror', onPageError);
         // `runProcess` is `undefined` if `start()` failed.
         if (runProcess) {
             await runProcess.terminate('SIGINT');
         }
-        logJestStep('afterAll end');
     };
-    // return { page }
     return;
     // Also called when the page throws an error or a warning
     function onConsole(msg) {
         const type = msg.type();
         Logs_1.Logs.add({
-            logType: type === 'error' ? 'Browser Error' : 'Browser Log',
+            logSource: type === 'error' ? 'Browser Error' : 'Browser Log',
             logText: JSON.stringify({
                 type,
                 text: msg.text(),
                 location: msg.location(),
                 args: msg.args(),
             }, null, 2),
-            testContext,
         });
     }
     // For uncaught exceptions
     function onPageError(err) {
         Logs_1.Logs.add({
-            logType: 'Browser Error',
+            logSource: 'Browser Error',
             logText: JSON.stringify({
                 text: err.message,
                 location: err.stack,
             }, null, 2),
-            testContext,
-        });
-    }
-    function logJestStep(stepName) {
-        if (!debug) {
-            return;
-        }
-        Logs_1.Logs.add({
-            logType: 'Jest',
-            logText: stepName,
-            testContext,
         });
     }
 }
 exports.run = run;
-async function start(testContext) {
-    const { cmd, additionalTimeout, serverIsReadyMessage, serverIsReadyDelay } = testContext;
-    let hasStarted = false;
+function getRunInfo() {
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    (0, utils_2.assert)(testInfo.runInfo);
+    return testInfo.runInfo;
+}
+async function start() {
+    const { cmd, additionalTimeout, serverIsReadyMessage, serverIsReadyDelay } = getRunInfo();
+    const done = (0, utils_1.logProgress)(` | [run] ${cmd}`);
+    let hasSuccessfullyStarted = false;
     let resolveServerStart;
     let rejectServerStart;
     const promise = new Promise((_resolve, _reject) => {
         resolveServerStart = () => {
-            hasStarted = true;
+            Logs_1.Logs.add({
+                logSource: 'run()',
+                logText: 'server is ready',
+            });
+            hasSuccessfullyStarted = true;
             clearTimeout(serverStartTimeout);
             const runProcess = { terminate };
             _resolve(runProcess);
@@ -157,9 +136,8 @@ async function start(testContext) {
         rejectServerStart = async (err) => {
             done(true);
             Logs_1.Logs.add({
-                logType: 'stderr',
+                logSource: 'stderr',
                 logText: String(err),
-                testContext,
             });
             clearTimeout(serverStartTimeout);
             try {
@@ -167,35 +145,35 @@ async function start(testContext) {
             }
             catch (err) {
                 Logs_1.Logs.add({
-                    logType: 'process',
+                    logSource: 'run()',
                     logText: String(err),
-                    testContext,
                 });
             }
             _reject(err);
         };
     });
     const timeoutTotal = TIMEOUT_NPM_SCRIPT + additionalTimeout;
+    let hasTimedout = false;
     const serverStartTimeout = setTimeout(() => {
         let errMsg = '';
-        errMsg += `Server still didn't start after ${timeoutTotal / 1000} seconds of running the npm script \`${cmd}\`.`;
+        errMsg += `Server still didn't start after ${(0, utils_1.humanizeTime)(timeoutTotal)} of running the npm script \`${cmd}\`.`;
         if (serverIsReadyMessage) {
             errMsg += ` (The stdout of the npm script did not include: "${serverIsReadyMessage}".)`;
         }
+        hasTimedout = true;
         rejectServerStart(new Error(errMsg));
     }, timeoutTotal);
     // Kill any process that listens to port `3000`
     if (!process.env.CI && isLinux()) {
         await (0, utils_1.runCommand)('fuser -k 3000/tcp', { swallowError: true, timeout: 10 * 1000 });
     }
-    const done = (0, utils_1.logProgress)(` | [run] ${cmd}`);
-    const { terminate } = startScript(cmd, testContext, {
+    const { terminate } = execRunScript({
         onError(err) {
             rejectServerStart(err);
         },
         onExit() {
-            const exitIsExpected = hasStarted === true;
-            return exitIsExpected;
+            const exitIsPossible = hasSuccessfullyStarted === true || hasTimedout;
+            return exitIsPossible;
         },
         async onStdout(data) {
             const text = (0, strip_ansi_1.default)(data);
@@ -268,7 +246,8 @@ function stopProcess({ proc, cwd, cmd, signal, }) {
     }
     return promise;
 }
-function startScript(cmd, testContext, { onStdout, onStderr, onError, onExit, }) {
+function execRunScript({ onStdout, onStderr, onError, onExit, }) {
+    const { cwd, cmd } = getRunInfo();
     let [command, ...args] = cmd.split(' ');
     let detached = true;
     if (isWindows()) {
@@ -277,40 +256,39 @@ function startScript(cmd, testContext, { onStdout, onStderr, onError, onExit, })
             command = command + '.cmd';
         }
     }
-    const { cwd } = testContext;
+    Logs_1.Logs.add({
+        logSource: 'run()',
+        logText: `Spawn command \`${cmd}\``,
+    });
     const proc = (0, child_process_1.spawn)(command, args, { cwd, detached });
-    const prefix = `[Run Start][${cwd}][${cmd}]`;
     proc.stdin.on('data', async (data) => {
         onError(new Error(`Command is \`${cmd}\` (${cwd}) is invoking \`stdin\`: ${data}.`));
     });
     proc.stdout.on('data', async (data) => {
         data = data.toString();
         Logs_1.Logs.add({
-            logType: 'stdout',
+            logSource: 'stdout',
             logText: data,
-            testContext,
         });
         onStdout?.(data);
     });
     proc.stderr.on('data', async (data) => {
         data = data.toString();
         Logs_1.Logs.add({
-            logType: 'stderr',
+            logSource: 'stderr',
             logText: data,
-            testContext,
         });
         onStderr?.(data);
     });
     proc.on('exit', async (code) => {
-        const exitIsExpected = onExit();
+        const exitIsPossible = onExit();
         const isSuccessCode = [0, null].includes(code) || (isWindows() && code === 1);
-        const isExpected = isSuccessCode && exitIsExpected;
+        const isExpected = isSuccessCode && exitIsPossible;
         if (!isExpected) {
-            const errMsg = `${prefix} Unexpected premature process termination, exit code: ${code}`;
+            const errMsg = `Unexpected premature process termination, exit code: ${code}`;
             Logs_1.Logs.add({
                 logText: errMsg,
-                logType: 'stderr',
-                testContext,
+                logSource: 'stderr',
             });
             onError(new Error(errMsg));
             /*
@@ -325,9 +303,8 @@ function startScript(cmd, testContext, { onStdout, onStderr, onError, onExit, })
         }
         else {
             Logs_1.Logs.add({
-                logText: `${prefix} Process termination. (Nominal. Exit code: ${code}.)`,
-                logType: 'process',
-                testContext,
+                logText: `Process termination. (Nominal, exit code: ${code}.)`,
+                logSource: 'run()',
             });
         }
     });
@@ -385,11 +362,10 @@ async function fetch(...args) {
     }
     catch (err) {
         Logs_1.Logs.add({
-            logType: 'Connection Error',
+            logSource: 'Connection Error',
             logText: `Couldn't connect to \`${args[0]}\`. Args: \`${JSON.stringify(args.slice(1))}\`. Err: \`${
             // @ts-ignore
             err.message}\``,
-            testContext: null,
         });
         throw new Error("Couldn't connect to server. See `Connection Error` log for more details.");
     }
@@ -443,22 +419,7 @@ function isGithubAction() {
 }
 exports.isGithubAction = isGithubAction;
 function getCwd() {
-    const { testFile } = (0, getTestInfo_1.getTestInfo)();
+    const { testFile } = (0, getCurrentTest_1.getCurrentTest)();
     const cwd = (0, path_1.dirname)(testFile);
     return cwd;
 }
-function getTestName() {
-    const { testFile } = (0, getTestInfo_1.getTestInfo)();
-    const pathRelative = removeRootDir(testFile);
-    if (testFile.includes('examples')) {
-        return (0, path_1.dirname)(pathRelative);
-    }
-    else {
-        return pathRelative;
-    }
-}
-function removeRootDir(filePath) {
-    const rootDir = process.cwd();
-    (0, utils_2.assert)(filePath.startsWith(rootDir));
-    return filePath.slice(rootDir.length);
-}

package/dist/test.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = void 0;
 const utils_1 = require("./utils");
-const getTestInfo_1 = require("./getTestInfo");
+const getCurrentTest_1 = require("./getCurrentTest");
 function test(testDesc, testFn) {
-    const testInfo = (0, getTestInfo_1.getTestInfo)();
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     (0, utils_1.assert)(!testInfo.hasStartedRunning);
     testInfo.tests = testInfo.tests ?? [];
     testInfo.tests.push({

package/dist/utils/assert.js

@@ -26,7 +26,7 @@ function assert(condition, debugInfo) {
         `Reach out at ${projectInfo_1.projectInfo.githubRepository}/issues/new and include this error stack (the error stack is usually enough to fix the problem).`,
         'A maintainer will fix the bug (usually under 24 hours).',
         `Do not hesitate to reach out as it makes ${projectInfo_1.projectInfo.projectName} more robust.`,
-        debugStr
+        debugStr,
     ].join(' '), numberOfStackTraceLinesToRemove);
     throw internalError;
 }

package/dist/utils/cliConfig.d.ts

@@ -0,0 +1,4 @@
+export declare const cliConfig: {
+    debugEsbuild: boolean;
+    debug: boolean;
+};

package/dist/utils/cliConfig.js

@@ -0,0 +1,8 @@
+"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'),
+    debug: cliArgs.includes('--debug'),
+};

package/dist/utils/findFiles.d.ts

@@ -1,7 +1,9 @@
 export { findFiles };
+export { findFilesParseCliArgs };
 export type { FindFilter };
 declare type FindFilter = {
     terms: string[];
     exclude: boolean;
 };
 declare function findFiles(pattern: string, findFilter: null | FindFilter): Promise<string[]>;
+declare function findFilesParseCliArgs(): null | FindFilter;

package/dist/utils/findFiles.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.findFiles = void 0;
+exports.findFilesParseCliArgs = exports.findFiles = void 0;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const path_1 = __importDefault(require("path"));
 const runCommand_1 = require("./runCommand");
@@ -44,3 +44,23 @@ function applyFilter(filePathRelative, findFilter) {
     }
     return true;
 }
+function findFilesParseCliArgs() {
+    const terms = [];
+    let exclude = false;
+    process.argv.slice(2).forEach((arg) => {
+        if (arg === '--exclude') {
+            exclude = true;
+        }
+        if (!arg.startsWith('--')) {
+            terms.push(arg);
+        }
+    });
+    const filter = terms.length === 0
+        ? null
+        : {
+            terms,
+            exclude,
+        };
+    return filter;
+}
+exports.findFilesParseCliArgs = findFilesParseCliArgs;

package/dist/utils/humanizeTime.js

@@ -11,5 +11,8 @@ function humanizeTime(milliseconds) {
 }
 exports.humanizeTime = humanizeTime;
 function round(n) {
-    return n.toFixed(1);
+    let rounded = n.toFixed(1);
+    if (rounded.endsWith('.0'))
+        rounded = rounded.slice(0, -2);
+    return rounded;
 }

package/dist/utils/index.d.ts

@@ -5,3 +5,4 @@ export * from './humanizeTime';
 export * from './isTTY';
 export * from './findFiles';
 export * from './logProgress';
+export * from './cliConfig';

package/dist/utils/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./humanizeTime"), exports);
 __exportStar(require("./isTTY"), exports);
 __exportStar(require("./findFiles"), exports);
 __exportStar(require("./logProgress"), exports);
+__exportStar(require("./cliConfig"), exports);

package/dist/utils/logProgress.d.ts

@@ -1,2 +1,4 @@
 export { logProgress };
+export { ensureNewTerminalLine };
 declare function logProgress(text: string): (failed?: boolean) => void;
+declare function ensureNewTerminalLine(): boolean;

package/dist/utils/logProgress.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logProgress = void 0;
+exports.ensureNewTerminalLine = exports.logProgress = void 0;
 const isTTY_1 = require("./isTTY");
 const iconSuccess = '🟢';
 const iconPending = '🟠';
 const iconFail = '🔴';
+let terminalLineIsEmtpy = true;
 function logProgress(text) {
     if (!isTTY_1.isTTY) {
         const done = () => { };
         return done;
     }
     process.stdout.write(`${iconPending} ${text}`);
+    terminalLineIsEmtpy = false;
     let alreadyDone = false;
     const done = (failed) => {
         if (alreadyDone)
@@ -19,10 +21,17 @@ function logProgress(text) {
         clear();
         const iconDone = failed ? iconFail : iconSuccess;
         process.stdout.write(`${iconDone} ${text}\n`);
+        terminalLineIsEmtpy = true;
     };
     return done;
 }
 exports.logProgress = logProgress;
+function ensureNewTerminalLine() {
+    const val = terminalLineIsEmtpy;
+    terminalLineIsEmtpy = true;
+    return val;
+}
+exports.ensureNewTerminalLine = ensureNewTerminalLine;
 function clear() {
     // @ts-ignore
     process.stdout.clearLine();

package/dist/utils/projectInfo.js

@@ -4,5 +4,5 @@ exports.projectInfo = void 0;
 exports.projectInfo = {
     projectName: '@brillout/test-e2e',
     npmPackageName: '@brillout/test-e2e',
-    githubRepository: 'https://github.com/brillout/test-e2e'
+    githubRepository: 'https://github.com/brillout/test-e2e',
 };

package/package.json

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

package/dist/getTestInfo.d.ts

@@ -1,21 +0,0 @@
-export { getTestInfo };
-export { setTestInfo };
-import type { Page } from 'playwright-chromium';
-declare type TestInfo = {
-    testFile: string;
-    tests?: {
-        testDesc: string;
-        testFn: Function;
-    }[];
-    testCmd?: string;
-    testTimeout?: number;
-    hasStartedRunning?: boolean;
-    runWasCalled?: true;
-    skipped?: string;
-    beforeAll?: () => Promise<void>;
-    afterAll?: () => Promise<void>;
-    afterEach?: (hasFailed: boolean) => void;
-    page?: Page;
-};
-declare function getTestInfo(): TestInfo;
-declare function setTestInfo(testInfo_: null | TestInfo): void;

package/dist/getTestInfo.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTestInfo = exports.getTestInfo = void 0;
-const utils_1 = require("./utils");
-let testInfo = null;
-function getTestInfo() {
-    (0, utils_1.assert)(testInfo);
-    return testInfo;
-}
-exports.getTestInfo = getTestInfo;
-function setTestInfo(testInfo_) {
-    testInfo = testInfo_;
-}
-exports.setTestInfo = setTestInfo;