refactor mocha specific code into constants

Author: ShMcK

.gitignore

@@ -1,4 +1,7 @@
+.vscode
+.DS_Store
+
 node_modules
 src/*.js
 test/**/*.ts
-.tmp/*.js
+.tmp/*.js

lib/constants.js

@@ -1,2 +1,13 @@
 "use strict";
+var path_1 = require('path');
+var reporterPath = path_1.join(__dirname, 'reporter', 'index.js');
 exports.signal = '@@@CodeRoad Results@@@';
+exports.runnerPath = ['mocha', 'bin', 'mocha'];
+exports.runnerOptions = [
+    '--bail',
+    '--harmony',
+    '--no-colors',
+    '--timeout=3000',
+    '--compilers js:babel-register',
+    ("--reporter=" + reporterPath),
+];

lib/runner/paths/runner.js

@@ -0,0 +1,19 @@
+"use strict";
+var node_file_exists_1 = require('node-file-exists');
+var path_1 = require('path');
+var constants_1 = require('../../constants');
+var nestedPath = [__dirname, '..', '..', '..', '..'].concat(constants_1.runnerPath);
+var flattenedPath = [__dirname, '..', '..', '..', 'node_modules'].concat(constants_1.runnerPath);
+function getRunner() {
+    var nested = path_1.join.apply(this, nestedPath);
+    var flattened = path_1.join.apply(this, flattenedPath);
+    if (node_file_exists_1.default(nested)) {
+        return nested;
+    }
+    else if (node_file_exists_1.default(flattened)) {
+        return flattened;
+    }
+    throw new Error('Error finding test runner.');
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getRunner;

lib/runner/runner-process.js

@@ -1,11 +1,11 @@
 "use strict";
 var path_1 = require('path');
 var child_process_1 = require('child_process');
-var mocha_1 = require('./paths/mocha');
+var constants_1 = require('../constants');
+var runner_1 = require('./paths/runner');
 var node_1 = require('./paths/node');
-var reporterPath = path_1.join(__dirname, '..', 'reporter', 'index.js');
 var node = node_1.default();
-var mocha = mocha_1.default();
+var runner = runner_1.default();
 function spawnRunnerProcess(_a) {
     var dir = _a.dir, taskPosition = _a.taskPosition, testPath = _a.testPath;
     var options = {
@@ -20,16 +20,9 @@ function spawnRunnerProcess(_a) {
         TASK_POSITION: taskPosition,
         NODE_PATH: path_1.join(dir, 'node_modules'),
     });
-    return child_process_1.spawn(node, [
-        mocha,
-        '--bail',
-        '--harmony',
-        '--no-colors',
-        '--timeout=3000',
-        '--compilers js:babel-register',
-        ("--reporter=" + reporterPath),
-        testPath,
-    ], options);
+    return child_process_1.spawn(node, [runner]
+        .concat(constants_1.runnerOptions)
+        .concat(testPath), options);
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = spawnRunnerProcess;

src/constants.ts

@@ -1,3 +1,20 @@
+import { join } from 'path';
+
+const reporterPath = join(__dirname, 'reporter', 'index.js');
+
 // test results are taken after this signal
 // this helps to avoid parsing console.logs before the output
 export const signal = '@@@CodeRoad Results@@@';
+
+// path to test runner executable from "node_modules"
+export const runnerPath = ['mocha', 'bin', 'mocha'];
+
+// options passed in the runner command process
+export const runnerOptions = [
+  '--bail', // quit on first fail
+  '--harmony', // es6 features
+  '--no-colors',
+  '--timeout=3000',
+  '--compilers js:babel-register', // for import/export of modules
+  `--reporter=${reporterPath}`, // test feedback
+];

src/runner/paths/mocha.ts

@@ -0,0 +1,19 @@
+import fileExists from 'node-file-exists';
+import { join } from 'path';
+import { runnerPath } from '../../constants';
+
+const nestedPath = [__dirname, '..', '..', '..', '..'].concat(runnerPath);
+const flattenedPath = [__dirname, '..', '..', '..', 'node_modules'].concat(runnerPath);
+
+export default function getRunner(): string {
+  // runner, location may differ based on NPM version
+  const nested = join.apply(this, nestedPath);
+  const flattened = join.apply(this, flattenedPath);
+
+  if (fileExists(nested)) {
+    return nested;
+  } else if (fileExists(flattened)) {
+    return flattened;
+  }
+  throw new Error('Error finding test runner.');
+}

src/runner/paths/runner.ts

@@ -1,12 +1,12 @@
 import { join } from 'path';
 import { spawn } from 'child_process';
 
-import getMocha from './paths/mocha';
+import { runnerOptions } from '../constants';
+import getRunner from './paths/runner';
 import getNode from './paths/node';
 
-const reporterPath = join(__dirname, '..', 'reporter', 'index.js');
 const node = getNode();
-const mocha = getMocha();
+const runner = getRunner();
 
 export default function spawnRunnerProcess({dir, taskPosition, testPath}) {
   // node electron setup
@@ -25,15 +25,8 @@ export default function spawnRunnerProcess({dir, taskPosition, testPath}) {
   });
 
   // spawn child process calling mocha test runner
-  return spawn(node, [
-    // into shared node_modules directory
-    mocha,
-    '--bail', // quit on first fail
-    '--harmony', // es6 features
-    '--no-colors',
-    '--timeout=3000',
-    '--compilers js:babel-register', // for import/export of modules
-    `--reporter=${reporterPath}`, // test feedback
-    testPath, // unit tests
-  ], options);
+  return spawn(node, [runner]
+    .concat(runnerOptions)
+    .concat(testPath) // unit tests
+  , options);
 }

src/runner/runner-process.ts

@@ -21,7 +21,7 @@
         "src/testPath.ts",
         "src/reporter/index.ts",
         "src/runner/index.ts",
-        "src/runner/paths/mocha.ts",
+        "src/runner/paths/runner.ts",
         "src/runner/paths/node.ts",
         "src/runner/runner-process.ts",
         "src/runner/start-runner.ts",