bt-runner 3.0.1 → 3.1.0

package/dist/index.js

@@ -27,39 +27,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process = __importStar(require("child_process"));
 const path = __importStar(require("path"));
-const puppeteer_1 = __importDefault(require("puppeteer"));
 const helpers_1 = require("yargs/helpers");
 const yargs_1 = __importDefault(require("yargs/yargs"));
-const generate_1 = __importDefault(require("./generate"));
-const getPort_1 = __importDefault(require("./getPort"));
-const rimraf = require("rimraf");
+const util_1 = require("./util");
 async function run() {
-    const port = await (0, getPort_1.default)();
-    const args = await (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
-        .option("config", {
+    const port = await (0, util_1.getPort)();
+    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("port", {
-        alias: "p",
-        type: "number",
-        description: "select a port",
-        default: 9515
     }).argv;
-    const nbt = require(path.join(process.cwd(), args.config));
-    const tempFolder = (0, generate_1.default)(nbt.runners, nbt.additionalScripts);
-    const testFolder = path.resolve(nbt.testFolder);
-    const httpServerProc = child_process.spawn("node", [`${__dirname}/../dist/server.js`, tempFolder, testFolder], {
-        stdio: "inherit",
-        env: { ...process.env, PORT: port.toString() }
-    });
+    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 runTests(port, nbt.runners);
+        const success = await (0, util_1.runTests)(port, config.runners);
         if (!success)
             exitCode = 1;
     }
@@ -68,47 +52,8 @@ async function run() {
         exitCode = 1;
     }
     finally {
-        httpServerProc.kill("SIGINT");
-        rimraf.sync(tempFolder);
+        server.stop();
     }
     process.exit(exitCode);
 }
-async function runTests(serverPort, testRunners) {
-    const browser = await puppeteer_1.default.launch({
-        headless: true,
-        args: ["--disable-gpu", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--no-sandbox"]
-    });
-    const page = await browser.newPage();
-    page.on("console", (message) => {
-        console.log.apply(console, message.args().map((arg) => arg.remoteObject().value));
-    });
-    for (let i = 0; i < testRunners.length; i++) {
-        const runner = testRunners[i];
-        const runnerNumber = i + 1;
-        console.log(`Running test runner ${runnerNumber}`);
-        await page.goto(`http://localhost:${serverPort}/test-browser/index${runnerNumber}.html`);
-        const globals = runner.globals ?? [];
-        globals.push("mocha");
-        const result = await page.evaluate(async (globals) => {
-            for (const glob of globals) {
-                if (typeof window[glob] === "undefined") {
-                    console.log(`Required library '${glob}' not loaded. Aborting...`);
-                    return { failures: 1 };
-                }
-            }
-            return new Promise((resolve) => window.mocha.run(function (failures) {
-                resolve({ failures: failures });
-            }));
-        }, runner.globals ?? []);
-        if (result.failures != 0) {
-            await browser.close();
-            return false;
-        }
-        console.log();
-        console.log();
-    }
-    await browser.close();
-    return true;
-}
-function cleanup(httpServerProc, tempFolder) { }
 run();

package/dist/index_debug.js

@@ -23,28 +23,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
-const express_http_proxy_1 = __importDefault(require("express-http-proxy"));
 const path = __importStar(require("path"));
-const generate_1 = __importDefault(require("./generate"));
-const app = (0, express_1.default)();
-const nbt = require(path.join(process.cwd(), "nbt.json"));
-const outputPath = (0, generate_1.default)(nbt.runners, nbt.additionalScripts);
-app.use("/test-browser", express_1.default.static(outputPath));
-app.use("/test", express_1.default.static(path.resolve(nbt.testFolder)));
-if (nbt.proxies) {
-    for (const proxy of nbt.proxies) {
-        app.use(proxy.local, (0, express_http_proxy_1.default)(proxy.remote));
-    }
-}
-const urls = nbt.runners
+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.`);
-app.listen(7777, () => { });
+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);
+    });
+}

package/dist/util/Server.js

@@ -0,0 +1,64 @@
+"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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Server = void 0;
+const express_1 = __importDefault(require("express"));
+const path = __importStar(require("path"));
+const generateHtml_1 = require("./generateHtml");
+class Server {
+    constructor(config, port) {
+        this.config = config;
+        this.port = port;
+        this.testFolder = path.resolve(config.testFolder);
+    }
+    static create(config, port = 7777) {
+        return new Server(config, port);
+    }
+    start() {
+        const app = (0, express_1.default)();
+        this.config.runners.forEach((runner, i) => {
+            app.get(`/test-browser/index${i + 1}.html`, (_req, res) => {
+                const html = (0, generateHtml_1.generateHtml)(runner.dependencies, this.config.additionalScripts);
+                res.status(200).send(html);
+            });
+        });
+        app.use("/test", express_1.default.static(this.testFolder));
+        if (this.config.proxies) {
+            const httpproxy = require("express-http-proxy");
+            for (const proxy of this.config.proxies) {
+                app.use(proxy.local, httpproxy(proxy.remote));
+            }
+        }
+        this.server = app.listen(this.port, () => { });
+        return this;
+    }
+    stop() {
+        this.server?.close();
+    }
+}
+exports.Server = Server;

package/{tmp/browsertests-9PMQFx/index1.html → dist/util/generateHtml.js}

@@ -1,4 +1,8 @@
-<!DOCTYPE html>
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateHtml = void 0;
+function generateHtml(dependencies, additionalScripts) {
+    return `<!DOCTYPE html>
 <html>
     <head>
         <title>Mocha Tests</title>
@@ -14,12 +18,13 @@
             mocha.reporter("spec")
         </script>
         <script>
-            window.TEST = {}
-window.TEST2 = {}
+            ${additionalScripts ? additionalScripts.join("\n") : ""}
         </script>
         
-                <script src="/test/test.js"></script>
+        ${dependencies.map((dependency) => `        <script src="/test/${dependency}"></script>`).join("\n")}
 
         <div id="main">Test</div>
     </body>
-</html>
+</html>`;
+}
+exports.generateHtml = generateHtml;

package/dist/{getPort.js → util/getPort.js}

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPort = void 0;
 const net_1 = __importDefault(require("net"));
-async function default_1(options) {
+async function getPort(options) {
     return await new Promise((resolve, reject) => {
         const server = net_1.default.createServer();
         server.unref();
@@ -17,4 +18,4 @@ async function default_1(options) {
         });
     });
 }
-exports.default = default_1;
+exports.getPort = getPort;

package/dist/util/index.js

@@ -0,0 +1,21 @@
+"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 });
+__exportStar(require("./Config"), exports);
+__exportStar(require("./generateHtml"), exports);
+__exportStar(require("./getPort"), exports);
+__exportStar(require("./runTests"), exports);
+__exportStar(require("./Server"), exports);

package/dist/util/runTests.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runTests = void 0;
+const puppeteer_1 = __importDefault(require("puppeteer"));
+async function runTests(serverPort, testRunners) {
+    const browser = await puppeteer_1.default.launch({
+        headless: true,
+        args: ["--disable-gpu", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--no-sandbox"]
+    });
+    const page = await browser.newPage();
+    page.on("console", (message) => {
+        console.log.apply(console, message.args().map((arg) => arg.remoteObject().value));
+    });
+    for (let i = 0; i < testRunners.length; i++) {
+        const runner = testRunners[i];
+        const runnerNumber = i + 1;
+        console.log(`Running test runner ${runnerNumber}`);
+        await page.goto(`http://localhost:${serverPort}/test-browser/index${runnerNumber}.html`);
+        const globals = runner.globals ?? [];
+        globals.push("mocha");
+        const result = await page.evaluate(async (globals) => {
+            for (const glob of globals) {
+                if (typeof window[glob] === "undefined") {
+                    console.log(`Required library '${glob}' not loaded. Aborting...`);
+                    return { failures: 1 };
+                }
+            }
+            return new Promise((resolve) => window.mocha.run(function (failures) {
+                resolve({ failures: failures });
+            }));
+        }, runner.globals ?? []);
+        if (result.failures != 0) {
+            await browser.close();
+            return false;
+        }
+        console.log();
+        console.log();
+    }
+    await browser.close();
+    return true;
+}
+exports.runTests = runTests;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bt-runner",
-    "version": "3.0.1",
+    "version": "3.1.0",
     "description": "",
     "repository": {
         "type": "git",
@@ -14,8 +14,7 @@
         "browsertest-runner-debug": "dist/index_debug.js"
     },
     "files": [
-        "dist",
-        "tmp"
+        "dist"
     ],
     "scripts": {
         "prepublishOnly": "tsc"
@@ -24,14 +23,12 @@
         "express": "^4.18.1",
         "express-http-proxy": "^1.6.3",
         "puppeteer": "^16.2.0",
-        "rimraf": "^3.0.2",
         "yargs": "^17.5.1"
     },
     "devDependencies": {
         "@types/express": "^4.17.13",
         "@types/express-http-proxy": "^1.6.3",
         "@types/node": "^18.7.11",
-        "@types/rimraf": "^3.0.2",
         "@types/yargs": "^17.0.11"
     },
     "publishConfig": {

package/dist/generate.js

@@ -1,62 +0,0 @@
-"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 fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-function generate(runners, additionalScripts) {
-    const outputPath = fs.mkdtempSync(path.join(__dirname, "..", "tmp", "browsertests-"));
-    runners.forEach((runner, index) => {
-        writeHtml(outputPath, index + 1, runner.dependencies, additionalScripts);
-    });
-    return outputPath;
-}
-exports.default = generate;
-function writeHtml(outputPath, runnerNumber, dependencies, additionalScripts) {
-    const html = `<!DOCTYPE html>
-<html>
-    <head>
-        <title>Mocha Tests</title>
-    </head>
-
-    <body>
-        <div id="mocha"></div>
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.0.0/mocha.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/4.3.6/chai.min.js"></script>
-        <script>
-            mocha.setup("bdd")
-            mocha.reporter("spec")
-        </script>
-        <script>
-            ${additionalScripts ? additionalScripts.join("\n") : ""}
-        </script>
-        
-        ${dependencies.map((dependency) => `        <script src="/test/${dependency}"></script>`).join("\n")}
-
-        <div id="main">Test</div>
-    </body>
-</html>`;
-    fs.writeFileSync(path.join(outputPath, `index${runnerNumber}.html`), html);
-}

package/dist/server.js

@@ -1,18 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
-const path = require("path");
-const app = (0, express_1.default)();
-app.use("/test-browser", express_1.default.static(process.argv[2]));
-app.use("/test", express_1.default.static(process.argv[3]));
-const config = require(path.join(process.cwd(), "nbt.json"));
-if (config && config.proxies) {
-    const httpproxy = require("express-http-proxy");
-    for (const proxy of config.proxies) {
-        app.use(proxy.local, httpproxy(proxy.remote));
-    }
-}
-app.listen(process.env["PORT"] ?? 7777, () => { });

package/tmp/browsertests-9PMQFx/index2.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Mocha Tests</title>
-    </head>
-
-    <body>
-        <div id="mocha"></div>
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.0.0/mocha.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/4.3.6/chai.min.js"></script>
-        <script>
-            mocha.setup("bdd")
-            mocha.reporter("spec")
-        </script>
-        <script>
-            window.TEST = {}
-window.TEST2 = {}
-        </script>
-        
-                <script src="/test/test.js"></script>
-
-        <div id="main">Test</div>
-    </body>
-</html>

package/tmp/browsertests-CRhBRJ/index1.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Mocha Tests</title>
-    </head>
-
-    <body>
-        <div id="mocha"></div>
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.0.0/mocha.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/4.3.6/chai.min.js"></script>
-        <script>
-            mocha.setup("bdd")
-            mocha.reporter("spec")
-        </script>
-        <script>
-            window.TEST = {}
-window.TEST2 = {}
-        </script>
-        
-                <script src="/test/test.js"></script>
-
-        <div id="main">Test</div>
-    </body>
-</html>

package/tmp/browsertests-CRhBRJ/index2.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Mocha Tests</title>
-    </head>
-
-    <body>
-        <div id="mocha"></div>
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.0.0/mocha.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/4.3.6/chai.min.js"></script>
-        <script>
-            mocha.setup("bdd")
-            mocha.reporter("spec")
-        </script>
-        <script>
-            window.TEST = {}
-window.TEST2 = {}
-        </script>
-        
-                <script src="/test/test.js"></script>
-
-        <div id="main">Test</div>
-    </body>
-</html>

package/tmp/browsertests-CRhBRJ/mocha.test.js

@@ -1,100 +0,0 @@
-const expect = require("chai").expect
-
-    describe("Browser Mocha Tests", function () {
-        before((client, done) => {
-            client.captureBrowserConsoleLogs((event) => {
-                const args = event.args.map((arg) => arg.value)
-                console.log.apply(console, args)
-            })
-
-            done()
-        })
-    
-        after((client, done) => {
-            client.end(() => done())
-        })
-    
-        
-        it("Should run the Mocha tests without error (runner 1)", async (client) => {
-            client.url("http://localhost:7777/test-browser/index1.html")
-
-            client.waitForElementVisible("#main")
-
-            const executeFunction = (done) => {
-                const mocha = window.mocha
-
-                //add required test librarys in this if statement
-                if (!mocha) {
-                    console.log("Required library 'mocha' not loaded. Aborting...")
-                    done({ failures: 1 })
-                    return
-                }
-
-                if (!window.TEST) {
-            console.log("Required library 'TEST' not loaded. Aborting...")
-            done({ failures: 1 })
-            return
-        }
-if (!window.TEST2) {
-            console.log("Required library 'TEST2' not loaded. Aborting...")
-            done({ failures: 1 })
-            return
-        }
-                
-                mocha.run(function (failures) {
-                    done({ failures: failures })
-                })
-            }
-
-            const result = await new Promise(resolve => client.timeoutsAsyncScript(1500000).executeAsyncScript(
-                executeFunction,
-                (result) => resolve(result)
-            ))
-
-            expect(result.value).to.not.be.undefined
-            expect(result.value.failures).to.equal(0)
-        })
-        
-
-
-        it("Should run the Mocha tests without error (runner 2)", async (client) => {
-            client.url("http://localhost:7777/test-browser/index2.html")
-
-            client.waitForElementVisible("#main")
-
-            const executeFunction = (done) => {
-                const mocha = window.mocha
-
-                //add required test librarys in this if statement
-                if (!mocha) {
-                    console.log("Required library 'mocha' not loaded. Aborting...")
-                    done({ failures: 1 })
-                    return
-                }
-
-                if (!window.TEST) {
-            console.log("Required library 'TEST' not loaded. Aborting...")
-            done({ failures: 1 })
-            return
-        }
-if (!window.TEST2) {
-            console.log("Required library 'TEST2' not loaded. Aborting...")
-            done({ failures: 1 })
-            return
-        }
-                
-                mocha.run(function (failures) {
-                    done({ failures: failures })
-                })
-            }
-
-            const result = await new Promise(resolve => client.timeoutsAsyncScript(1500000).executeAsyncScript(
-                executeFunction,
-                (result) => resolve(result)
-            ))
-
-            expect(result.value).to.not.be.undefined
-            expect(result.value.failures).to.equal(0)
-        })
-        
-    })

package/tmp/browsertests-CRhBRJ/nightwatch.json

@@ -1 +0,0 @@
-{"src_folders":["/home/julian/git/jss/docker-node-browsertests/test-runner/tmp/browsertests-CRhBRJ"],"filter":"*.test.js","webdriver":{"start_process":true,"server_path":"/home/julian/.local/lib/node_modules/chromedriver/lib/chromedriver/chromedriver","port":9515,"timeout_options":{"timeout":1500000}},"test_runner":{"type":"mocha","options":{"ui":"bdd","reporter":"spec"}},"test_settings":{"default":{"request_timeout_options":{"timeout":1500000},"desiredCapabilities":{"javascriptEnabled":true,"acceptSslCerts":true,"acceptInsecureCerts":true,"browserName":"chrome","goog:chromeOptions":{"w3c":true,"args":["--headless","--disable-gpu","--ignore-certificate-errors","--no-sandbox","--disable-features=NetworkService"],"binary":"/usr/bin/google-chrome"}}}},"globals":{"waitForConditionTimeout":100000,"asyncHookTimeout":1500000,"unitTestsTimeout":100000,"customReporterCallbackTimeout":100000,"retryAssertionTimeout":50000}}

package/tmp/browsertests-Ef8QDb/index1.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Mocha Tests</title>
-    </head>
-
-    <body>
-        <div id="mocha"></div>
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.0.0/mocha.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/4.3.6/chai.min.js"></script>
-        <script>
-            mocha.setup("bdd")
-            mocha.reporter("spec")
-        </script>
-        <script>
-            window.TEST = {}
-window.TEST2 = {}
-        </script>
-        
-                <script src="/test/test.js"></script>
-
-        <div id="main">Test</div>
-    </body>
-</html>