bt-runner 3.3.0 → 4.0.0

package/dist/index.js

@@ -33,17 +33,24 @@ const yargs_1 = __importDefault(require("yargs/yargs"));
 const util_1 = require("./util");
 async function run() {
     const port = await (0, util_1.getPort)();
-    const args = await (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("config", {
+    const args = await (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
+        .option("config", {
         alias: "c",
         type: "string",
         description: "select a config file",
         default: "nbt.json"
+    })
+        .option("debug", {
+        alias: "d",
+        type: "boolean",
+        description: "run in debug mode",
+        default: false
     }).argv;
     const config = require(path.join(process.cwd(), args.config));
     const server = util_1.Server.create(config, port).start();
     let exitCode = 0;
     try {
-        const success = await (0, util_1.runTests)(port, config.runners);
+        const success = await (0, util_1.runTests)(port, config.runners, args.debug);
         if (!success)
             exitCode = 1;
     }

package/dist/util/Server.js

@@ -59,12 +59,20 @@ class Server {
         return this;
     }
     transformProxy(proxy) {
-        if ("remote" in proxy)
-            return proxy;
-        const remoteFromEnv = process.env[proxy.env];
-        if (!remoteFromEnv)
-            throw new Error(`No environment variable found for proxy: ${proxy.env}`);
-        return { local: proxy.local, remote: remoteFromEnv };
+        let remote = proxy.remote;
+        const regex = /{{([a-z_]+)}}/i;
+        while (regex.test(remote)) {
+            const match = regex.exec(remote);
+            if (match) {
+                const envVar = match[1];
+                const envValue = process.env[envVar];
+                console.log(envValue);
+                if (!envValue)
+                    throw new Error(`Environment variable ${envVar} is not defined`);
+                remote = remote.replace(match[0], envValue);
+            }
+        }
+        return { local: proxy.local, remote };
     }
     stop() {
         this.server?.close();

package/dist/util/generateHtml.js

@@ -21,8 +21,6 @@ function generateHtml(dependencies, additionalScripts) {
             ${additionalScripts ? additionalScripts.join("\n") : ""}
         </script>
         
-        ${dependencies.map((dependency) => `        <script src="/test/${dependency}"></script>`).join("\n")}
-
         <div id="main">Test</div>
     </body>
 </html>`;

package/dist/util/runTests.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTests = void 0;
 const puppeteer_1 = __importDefault(require("puppeteer"));
-async function runTests(serverPort, testRunners) {
+async function runTests(serverPort, testRunners, debug) {
     const browser = await puppeteer_1.default.launch({
-        headless: true,
+        headless: !debug,
         args: ["--disable-gpu", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--no-sandbox"]
     });
     const page = await browser.newPage();
@@ -26,6 +26,9 @@ async function runTests(serverPort, testRunners) {
             globalThis.process.env = globalThis.process.env ?? {};
             globalThis.process.env = { ...globalThis.process.env, ...params };
         }, process.env);
+        for (const dependency of runner.dependencies) {
+            await page.addScriptTag({ url: `/test/${dependency}` });
+        }
         const globals = runner.globals ?? [];
         globals.push("mocha");
         const result = await page.evaluate(async (globals) => {
@@ -39,6 +42,10 @@ async function runTests(serverPort, testRunners) {
                 resolve({ failures: failures });
             }));
         }, runner.globals ?? []);
+        if (debug) {
+            console.log("Press any key to continue...");
+            await new Promise((resolve) => process.stdin.once("data", resolve));
+        }
         if (result.failures != 0) {
             await browser.close();
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bt-runner",
-    "version": "3.3.0",
+    "version": "4.0.0",
     "description": "",
     "repository": {
         "type": "git",
@@ -10,8 +10,7 @@
     "author": "js-soft <julian.koenig@js-soft.com> (https://www.js-soft.com/)",
     "main": "index.js",
     "bin": {
-        "browsertest-runner": "dist/index.js",
-        "browsertest-runner-debug": "dist/index_debug.js"
+        "browsertest-runner": "dist/index.js"
     },
     "files": [
         "dist"

package/dist/index_debug.js

@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __importStar(require("path"));
-const util_1 = require("./util");
-const port = 7777;
-const config = require(path.join(process.cwd(), "nbt.json"));
-const server = util_1.Server.create(config, port).start();
-const urls = config.runners
-    .map((_runner, index) => `- http://localhost:7777/test-browser/index${index + 1}.html`)
-    .join("\n");
-console.log(`Server Started. Open under the following URL's
-${urls}
-and type "mocha.run()" in the debug console to run the tests.`);
-const signals = [
-    "SIGHUP",
-    "SIGINT",
-    "SIGQUIT",
-    "SIGILL",
-    "SIGTRAP",
-    "SIGABRT",
-    "SIGBUS",
-    "SIGFPE",
-    "SIGUSR1",
-    "SIGSEGV",
-    "SIGUSR2",
-    "SIGTERM"
-];
-for (const signal of signals) {
-    process.on(signal, () => {
-        server.stop();
-        process.exit(0);
-    });
-}