bt-runner 2.0.0-beta.5 → 2.0.1-beta.1

package/dist/generator.js

@@ -85,7 +85,7 @@ function writeTestFile(outputPath, iteration, globals) {
     const globalsString = globals
         .map((glob) => `if (!window.${glob}) {
             logs.push(["Required library '${glob}' not loaded. Aborting..."])
-            done({ failures: 1, logs: logs })
+            localDone({ failures: 1, logs: logs })
             return
         }`)
         .join("\n");
@@ -105,22 +105,21 @@ function writeTestFile(outputPath, iteration, globals) {
             client.waitForElementVisible("#main")
             client.timeoutsAsyncScript(1500000).executeAsync(
                 (_data, done) => {
+                    const localDone = typeof _data === "function" ? _data : done
+
                     const mocha = window.mocha
     
                     //add required test librarys in this if statement
                     if (!mocha) {
                         logs.push(["Required library 'mocha' not loaded. Aborting..."])
-                        done({ failures: 1, logs: logs })
+                        localDone({ failures: 1, logs: logs })
                         return
                     }
 
                     ${globalsString}
-
-                    console.log("function", _data, done)
                     
                     mocha.run(function (failures) {
-                        console.log("mocha", _data, done)
-                        done({ failures: failures, logs: logs })
+                        localDone({ failures: failures, logs: logs })
                     })
                 },
                 [],
@@ -186,7 +185,7 @@ function writeConfig(outputPath, port) {
                     "goog:chromeOptions": {
                         w3c: true,
                         args: [
-                            // "--headless",
+                            "--headless",
                             "--disable-gpu",
                             "--ignore-certificate-errors",
                             "--no-sandbox",

package/dist/index.js

@@ -29,6 +29,7 @@ const path = __importStar(require("path"));
 const helpers_1 = require("yargs/helpers");
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const generator = __importStar(require("./generator"));
+const rimraf = require("rimraf");
 Nightwatch.cli(async function (argv) {
     const args = await (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
         .option("config", {
@@ -64,6 +65,6 @@ Nightwatch.cli(async function (argv) {
 });
 function cleanup(httpServerProc, tempFolder) {
     httpServerProc.kill("SIGINT");
-    // rimraf.sync(tempFolder)
+    rimraf.sync(tempFolder);
     process.exit(0);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bt-runner",
-    "version": "2.0.0-beta.5",
+    "version": "2.0.1-beta.1",
     "description": "",
     "repository": {
         "type": "git",
@@ -21,21 +21,21 @@
         "prepublishOnly": "tsc"
     },
     "dependencies": {
-        "chai": "^4.3.4",
-        "express": "^4.17.1",
+        "chai": "^4.3.6",
+        "express": "^4.17.2",
         "express-http-proxy": "^1.6.3",
-        "mocha": "^9.1.3",
-        "nightwatch": "^2.0.0-beta.1",
+        "mocha": "^9.2.0",
+        "nightwatch": "^2.0.0-beta.3",
         "rimraf": "^3.0.2",
-        "yargs": "^17.3.0"
+        "yargs": "^17.3.1"
     },
     "devDependencies": {
         "@types/express": "^4.17.13",
         "@types/express-http-proxy": "^1.6.3",
-        "@types/express-serve-static-core": "^4.17.26",
-        "@types/node": "^16.11.12",
+        "@types/express-serve-static-core": "^4.17.28",
+        "@types/node": "^17.0.13",
         "@types/rimraf": "^3.0.2",
-        "@types/yargs": "^17.0.7"
+        "@types/yargs": "^17.0.8"
     },
     "publishConfig": {
         "registry": "https://registry.npmjs.org"

package/dist/nightwatch.js

@@ -1,57 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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;
-};
-exports.__esModule = true;
-exports.runNightwatch = void 0;
-var child_process = __importStar(require("child_process"));
-var nightwatch = __importStar(require("nightwatch"));
-var path = __importStar(require("path"));
-function runNightwatch(tempFolder, testFolder) {
-    var httpServerProc = child_process.spawn("node", ["".concat(__dirname, "/server.js"), tempFolder, testFolder], {
-        stdio: "inherit"
-    });
-    nightwatch.cli(function (argv) {
-        argv.config = path.join(tempFolder, "nightwatch.json");
-        var runner = nightwatch.CliRunner(argv);
-        runner
-            .setup()
-            .startWebDriver()["catch"](function (err) {
-            console.error(err);
-            cleanup(httpServerProc, tempFolder);
-        })
-            .then(function () {
-            return runner.runTests();
-        })["catch"](function (err) {
-            console.error(err);
-            runner.processListener.setExitCode(10);
-            cleanup(httpServerProc, tempFolder);
-        })
-            .then(function () {
-            return runner.stopWebDriver();
-        })
-            .then(function () {
-            cleanup(httpServerProc, tempFolder);
-        })["catch"](function (err) {
-            console.error(err);
-            cleanup(httpServerProc, tempFolder);
-        });
-    });
-}
-exports.runNightwatch = runNightwatch;

package/tmp/browsertests-VU06XW/index1.html

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Mocha Tests</title>
-    </head>
-
-    <body>
-        <div id="mocha"></div>
-        
-        
-        <script>
-            window.logs = []
-            const oldLog = console.log
-            console.log = function () {
-                oldLog.apply(console, arguments)
-                window.logs.push(Array.from(arguments))
-            }
-        </script>
-        
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/7.2.0/mocha.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/4.2.0/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-VU06XW/mocha1.test.js

@@ -1,58 +0,0 @@
-const expect = require("chai").expect
-
-describe("Browser Mocha Tests", function () {
-    beforeEach((client, done) => {
-        client.url("http://localhost:7777/test-browser/index1.html")
-        done()
-    })
-
-    after((client, done) => {
-        client.end(() => done())
-    })
-
-    it("Should run the Mocha tests without error", (client) => {
-        client.waitForElementVisible("#main")
-        client.timeoutsAsyncScript(1500000).executeAsync(
-            (_data, done) => {
-                const mocha = window.mocha
-
-                //add required test librarys in this if statement
-                if (!mocha) {
-                    logs.push(["Required library 'mocha' not loaded. Aborting..."])
-                    done({ failures: 1, logs: logs })
-                    return
-                }
-
-                if (!window.TEST) {
-                    logs.push(["Required library 'TEST' not loaded. Aborting..."])
-                    done({ failures: 1, logs: logs })
-                    return
-                }
-                if (!window.TEST2) {
-                    logs.push(["Required library 'TEST2' not loaded. Aborting..."])
-                    done({ failures: 1, logs: logs })
-                    return
-                }
-
-                mocha.run(function (failures) {
-                    done({ failures: failures, logs: logs })
-                })
-            },
-            [],
-            (result) => {
-                console.log("\n--- browser mocha output ---")
-
-                if (result && result.value && result.value.logs) {
-                    for (const logs of result.value.logs) {
-                        console.log.apply(null, logs)
-                    }
-                }
-
-                console.log("--- finished browser mocha output ---")
-
-                expect(result.value).to.not.be.undefined
-                expect(result.value.failures).to.equal(0)
-            }
-        )
-    })
-})

package/tmp/browsertests-VU06XW/nightwatch.json

@@ -1,38 +0,0 @@
-{
-    "src_folders": ["/home/julian/git/jss/docker-node-browsertests/test-runner/tmp/browsertests-VU06XW"],
-    "filter": "*.test.js",
-    "webdriver": {
-        "start_process": true,
-        "server_path": "/home/julian/.local/lib/node_modules/chromedriver/lib/chromedriver/chromedriver",
-        "port": 9515
-    },
-    "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": [
-                        "--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
-    }
-}