restructure mocha test runner

Author: ShMcK

lib/constants.js

@@ -1,54 +1,27 @@
 "use strict";
-var constants_1 = require('./constants');
-var runner_process_1 = require('./runner-process');
-var write_test_1 = require('./write-test');
-var process_console_log_1 = require('process-console-log');
-function runner(_a) {
-    var testString = _a.testString, config = _a.config, handleResult = _a.handleResult;
-    write_test_1.default(config, testString);
-    var runner = runner_process_1.default(config);
-    var final = null;
-    var signalMatch = new RegExp(constants_1.signal);
-    return new Promise(function run(resolve, reject) {
-        runner.stdout.on('data', function onData(data) {
-            data = data.toString();
-            var match = signalMatch.exec(data);
-            if (!match) {
-                try {
-                    process_console_log_1.parseLog(data);
-                }
-                catch (e) {
-                    process_console_log_1.parseLog(data);
-                }
-                return;
-            }
-            var resultString = data.substring(match.index + constants_1.signal.length);
-            var result = JSON.parse(JSON.stringify(resultString));
-            if (typeof result === 'string') {
-                result = JSON.parse(result);
-            }
-            switch (result.pass) {
-                case true:
-                    final = result.passes[result.passes.length - 1];
-                    break;
-                case false:
-                    final = result.failures[0];
-                    break;
-                default:
-                    console.log('error processing result: ', result);
-            }
-            final.change = final.taskPosition - config.taskPosition;
-            final.pass = final.change > 0;
-            final.completed = result.pass;
-            handleResult(final);
-        });
-        runner.stderr.on('data', function onError(data) {
-            console.log('test error', data.toString());
-        });
-        runner.on('close', function onClose(code) {
-            resolve(final);
-        });
+var writeTests_1 = require('./writeTests');
+var runner_1 = require('./runner');
+var testPath_1 = require('./testPath');
+var settings = {
+    dir: null,
+    tutorial: null,
+    tests: '',
+    step: 0,
+    testPath: '',
+};
+exports.combineTests = function (options) {
+    options.testPath = testPath_1.default(options);
+    settings = Object.assign(settings, options);
+    writeTests_1.default(options);
+};
+function start(_a) {
+    var taskPosition = _a.taskPosition, handleResult = _a.handleResult;
+    var dir = settings.dir;
+    runner_1.default({
+        dir: dir,
+        taskPosition: taskPosition,
+        handleResult: handleResult,
     });
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = runner;
+exports.default = start;

lib/import-paths.js

@@ -1,5 +1,5 @@
 "use strict";
-var constants_1 = require('./constants');
+var constants_1 = require('../helpers/constants');
 exports = module.exports = reporter;
 function reporter(runner) {
     var result = {

lib/index.js

@@ -0,0 +1,2 @@
+"use strict";
+exports.signal = '@@@CodeRoad Results@@@';

lib/reporter.js renamed to lib/reporter/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var start_runner_1 = require('./start-runner');
+var runner_process_1 = require('./runner-process');
+function runner(options) {
+    var runner = runner_process_1.default(options);
+    return start_runner_1.default(runner, options.handleResult);
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = runner;

lib/runner-process.js

@@ -0,0 +1,16 @@
+"use strict";
+var node_file_exists_1 = require('node-file-exists');
+var path_1 = require('path');
+function getMocha() {
+    var mocha = path_1.join(__dirname, '..', '..', '..', '..', 'mocha', 'bin', 'mocha');
+    if (!node_file_exists_1.default(mocha)) {
+        mocha = path_1.join(__dirname, '..', '..', '..', 'node_modules', 'mocha', 'bin', 'mocha');
+        if (!node_file_exists_1.default(mocha)) {
+            var error = 'Error finding mocha';
+            throw (error);
+        }
+    }
+    return mocha;
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getMocha;

lib/runner/constants.js

@@ -0,0 +1,13 @@
+"use strict";
+var path_1 = require('path');
+function getNode() {
+    if (process.platform === 'darwin' && process.resourcesPath) {
+        return path_1.resolve(process.resourcesPath, '..', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Atom Helper');
+    }
+    else if (process.platform.match(/win/)) {
+        return 'node';
+    }
+    return process.execPath;
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getNode;

lib/runner/index.js

@@ -0,0 +1,35 @@
+"use strict";
+var path_1 = require('path');
+var child_process_1 = require('child_process');
+var mocha_1 = require('./paths/mocha');
+var node_1 = require('./paths/node');
+var reporterPath = path_1.join(__dirname, '..', 'reporter', 'reporter.js');
+var node = node_1.default();
+var mocha = mocha_1.default();
+function spawnRunnerProcess(_a) {
+    var dir = _a.dir, taskPosition = _a.taskPosition, testPath = _a.testPath;
+    var options = {
+        cwd: dir
+    };
+    if (options.env == null) {
+        options.env = Object.create(process.env);
+    }
+    Object.assign(options.env, {
+        ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
+        DIR: dir,
+        TASK_POSITION: taskPosition,
+        NODE_PATH: path_1.join(dir, 'node_modules'),
+    });
+    return child_process_1.spawn(node, [
+        mocha,
+        '--bail',
+        '--harmony',
+        '--no-colors',
+        '--timeout=3000',
+        '--require babelhook',
+        ("--reporter=" + reporterPath),
+        testPath,
+    ], options);
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = spawnRunnerProcess;