@brillout/test-e2e 0.2.2 → 0.3.1

package/dist/buildTs.js

@@ -19,7 +19,7 @@ async function buildTs(entry, outfile) {
         format: 'esm',
         target: 'es2020',
         bundle: true,
-        external: ['./node_modules/*', '@brillout/test-e2e'],
+        packages: 'external',
         minify: false,
     });
     {

package/dist/cli.js

@@ -7,8 +7,10 @@ const source_map_support_1 = __importDefault(require("source-map-support"));
 const utils_1 = require("./utils");
 const runTestSuites_1 = require("./runTestSuites");
 const buildTs_1 = require("./buildTs");
+const Logs_1 = require("./Logs");
 initSourceMap();
 initPromiseRejectionHandler();
+initUserExitHandler();
 cli();
 function cli() {
     const filter = (0, utils_1.findFilesParseCliArgs)();
@@ -20,6 +22,11 @@ function initPromiseRejectionHandler() {
         process.exit(1);
     });
 }
+function initUserExitHandler() {
+    process.on('SIGINT', function () {
+        Logs_1.Logs.flushLogs();
+    });
+}
 function initSourceMap() {
     source_map_support_1.default.install({
         retrieveSourceMap: function (source) {

package/dist/getCurrentTest.d.ts

@@ -14,10 +14,11 @@ declare type TestInfo = {
         cwd: string;
         testFunctionTimeout: number;
         additionalTimeout: number;
-        serverIsReadyMessage?: string;
+        serverIsReadyMessage?: string | ((log: string) => boolean);
         serverIsReadyDelay: number;
         inspect: boolean;
         doNotFailOnWarning: boolean;
+        serverUrl: string;
     };
     hasStartedRunning?: boolean;
     skipped?: string;

package/dist/runTests.js

@@ -8,7 +8,7 @@ const getCurrentTest_1 = require("./getCurrentTest");
 const Logs_1 = require("./Logs");
 const utils_1 = require("./utils");
 const picocolors_1 = __importDefault(require("picocolors"));
-const logsContainError_errMsg = (isTermination) => [picocolors_1.default.bold('Error/warning'), !isTermination ? '' : ' during termination', ', see logs below.'].join(' ');
+const logsContainError_errMsg = (isTermination) => [picocolors_1.default.bold('Encountered an error or warning'), !isTermination ? '' : ' during termination', ', see logs below.'].join('');
 async function runTests(browser) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     if (utils_1.isTTY) {

package/dist/setup.d.ts

@@ -13,17 +13,17 @@ export { isLinux };
 export { isWindows };
 export { isMac };
 export { sleep };
-export declare let urlBase: string;
-export declare const urlBaseChange: (url: string) => string;
+export { getServerUrl };
 export { editFile, editFileRevert } from './editFile';
 declare function skip(reason: string): void;
-declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, doNotFailOnWarning, }?: {
+declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, doNotFailOnWarning, serverUrl, }?: {
     additionalTimeout?: number;
-    serverIsReadyMessage?: string;
+    serverIsReadyMessage?: string | ((log: string) => boolean);
     serverIsReadyDelay?: number;
     inspect?: boolean;
     cwd?: string;
     doNotFailOnWarning?: boolean;
+    serverUrl?: string;
 }): void;
 declare function autoRetry(test: () => void | Promise<void>, { timeout }?: {
     timeout?: number;
@@ -31,3 +31,4 @@ declare function autoRetry(test: () => void | Promise<void>, { timeout }?: {
 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;

package/dist/setup.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.editFileRevert = exports.editFile = exports.urlBaseChange = exports.urlBase = exports.sleep = exports.isMac = exports.isWindows = exports.isLinux = exports.isGithubAction = exports.isMinNodeVersion = exports.skip = exports.run = exports.expectError = exports.fetch = exports.fetchHtml = exports.autoRetry = exports.partRegex = void 0;
+exports.editFileRevert = exports.editFile = exports.getServerUrl = exports.sleep = exports.isMac = exports.isWindows = exports.isLinux = exports.isGithubAction = exports.isMinNodeVersion = exports.skip = exports.run = exports.expectError = exports.fetch = exports.fetchHtml = exports.autoRetry = exports.partRegex = void 0;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const utils_1 = require("./utils");
@@ -23,12 +23,10 @@ var part_regex_1 = require("@brillout/part-regex");
 Object.defineProperty(exports, "partRegex", { enumerable: true, get: function () { return part_regex_1.partRegex; } });
 var Logs_2 = require("./Logs");
 Object.defineProperty(exports, "expectError", { enumerable: true, get: function () { return Logs_2.expectError; } });
-exports.urlBase = 'http://localhost:3000';
-const urlBaseChange = (url) => (exports.urlBase = url);
-exports.urlBaseChange = urlBaseChange;
 var editFile_2 = require("./editFile");
 Object.defineProperty(exports, "editFile", { enumerable: true, get: function () { return editFile_2.editFile; } });
 Object.defineProperty(exports, "editFileRevert", { enumerable: true, get: function () { return editFile_2.editFileRevert; } });
+const serverUrlDefault = 'http://localhost:3000';
 const TIMEOUT_NPM_SCRIPT = 2 * 60 * 1000;
 const TIMEOUT_TEST_FUNCTION = 60 * 1000 * (!(0, utils_1.isGithubAction)() ? 1 : (0, utils_1.isWindows)() ? 5 : 3);
 const TIMEOUT_PROCESS_TERMINATION = 10 * 1000 * (!(0, utils_1.isGithubAction)() ? 1 : (0, utils_1.isLinux)() ? 1 : 4);
@@ -41,7 +39,7 @@ function skip(reason) {
 exports.skip = skip;
 function run(cmd, { 
 //baseUrl = '',
-additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = utils_1.cliConfig.inspect, cwd, doNotFailOnWarning = false, } = {}) {
+additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = utils_1.cliConfig.inspect, cwd, doNotFailOnWarning = false, serverUrl = serverUrlDefault, } = {}) {
     additionalTimeout += serverIsReadyDelay;
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     testInfo.runInfo = {
@@ -53,6 +51,7 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
         serverIsReadyDelay,
         inspect,
         doNotFailOnWarning,
+        serverUrl,
     };
     if (inspect) {
         Logs_1.Logs.flushEagerly = true;
@@ -68,7 +67,7 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
         /*
         await bailOnTimeout(
           async () => {
-            await page.goto(urlBase + baseUrl)
+            await page.goto(getServerUrl() + baseUrl)
           },
           { timeout: TIMEOUT_PAGE_LOAD + additionalTimeout },
         )
@@ -176,9 +175,11 @@ async function start() {
         await terminate();
         rejectServerStart(new Error(errMsg));
     }, timeoutTotal);
-    // Kill any process that listens to port `3000`
+    // Kill any process that listens to the server port
     if (!process.env.CI && (0, utils_1.isLinux)()) {
-        await (0, utils_1.runCommand)('fuser -k 3000/tcp', { swallowError: true, timeout: 10 * 1000 });
+        const port = getPort();
+        (0, utils_2.assert)(/\d+/.test(port));
+        await (0, utils_1.runCommand)(`fuser -k ${port}/tcp`, { swallowError: true, timeout: 10 * 1000 });
     }
     const { terminate, processHasExited } = execRunScript({
         async onFailure(err) {
@@ -191,16 +192,17 @@ async function start() {
             return exitIsPossible;
         },
         async onStdout(data) {
-            const text = (0, strip_ansi_1.default)(data);
+            const log = (0, strip_ansi_1.default)(data);
             const isServerReady = 
             // Custom
-            (serverIsReadyMessage && text.includes(serverIsReadyMessage)) ||
+            (typeof serverIsReadyMessage === 'string' && log.includes(serverIsReadyMessage)) ||
+                ((0, utils_1.isCallable)(serverIsReadyMessage) && serverIsReadyMessage(log)) ||
                 // Express.js server
-                text.includes('Server running at') ||
+                log.includes('Server running at') ||
                 // npm package `serve`
-                text.includes('Accepting connections at') ||
+                log.includes('Accepting connections at') ||
                 // Vite
-                (text.includes('Local:') && text.includes('http://localhost:3000/'));
+                (log.includes('Local:') && log.includes('http://localhost:3000/'));
             if (isServerReady) {
                 (0, utils_2.assert)(serverIsReadyDelay);
                 await (0, utils_1.sleep)(serverIsReadyDelay);
@@ -401,7 +403,7 @@ async function autoRetry(test, { timeout = TIMEOUT_AUTORETRY } = {}) {
 }
 exports.autoRetry = autoRetry;
 async function fetchHtml(pathname) {
-    const response = await fetch(exports.urlBase + pathname);
+    const response = await fetch(getServerUrl() + pathname);
     const html = await response.text();
     return html;
 }
@@ -453,3 +455,15 @@ function getCwd() {
     const cwd = (0, path_1.dirname)(testFile);
     return cwd;
 }
+function getServerUrl() {
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    const serverUrl = testInfo.runInfo?.serverUrl;
+    return serverUrl;
+}
+exports.getServerUrl = getServerUrl;
+function getPort() {
+    const serverUrl = getServerUrl();
+    const port = serverUrl.split(':').slice(-1)[0].split('/')[0];
+    (0, utils_2.assert)(/\d+/.test(port), { serverUrl });
+    return port;
+}

package/dist/utils/isCallable.d.ts

@@ -1 +1 @@
-export declare function isCallable<T extends Function>(thing: T | unknown): thing is T;
+export declare function isCallable(thing: unknown): thing is Function;

package/dist/utils/runCommand.d.ts

@@ -1,6 +1,6 @@
 export { runCommand };
-declare function runCommand(cmd: string, { swallowError, timeout, cwd }?: {
-    swallowError?: true;
+declare function runCommand(cmd: string, { swallowError, timeout, cwd, }?: {
+    swallowError?: boolean;
     timeout?: number;
     cwd?: string;
 }): Promise<string>;

package/dist/utils/runCommand.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommand = void 0;
 const child_process_1 = require("child_process");
-function runCommand(cmd, { swallowError, timeout = 5000, cwd } = {}) {
+function runCommand(cmd, { swallowError = false, timeout = 5000, cwd = process.cwd(), } = {}) {
     const { promise, resolvePromise } = genPromise();
     const t = setTimeout(() => {
         console.error(`Command call \`${cmd}\` timeout [${timeout / 1000} seconds][${cwd}].`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   "dependencies": {
     "@brillout/part-regex": "^0.1.2",
     "chai": "^4.3.6",
-    "esbuild": "^0.15.9",
+    "esbuild": "^0.16.5",
     "fast-glob": "^3.2.12",
     "node-fetch": "^2.6.1",
     "picocolors": "^1.0.0",