setup test runner requires using rewire

ShMcK · ShMcK · commit 6143aa22ec44 · 2016-08-08T12:03:16.000-07:00
diff --git a/lib/runner/runner-process.js b/lib/runner/runner-process.js
@@ -26,7 +26,7 @@ function spawnRunnerProcess(_a) {
         '--harmony',
         '--no-colors',
         '--timeout=3000',
-        '--require babelhook',
+        '--compilers js:babel-core/register',
         ("--reporter=" + reporterPath),
         testPath,
     ], options);
diff --git a/lib/runner/start-runner.js b/lib/runner/start-runner.js
@@ -1,10 +1,10 @@
 "use strict";
 var process_console_log_1 = require('process-console-log');
 var constants_1 = require('../constants');
+var signalMatch = new RegExp(constants_1.signal);
 function startRunner(_a) {
     var runner = _a.runner, handleResult = _a.handleResult, taskPosition = _a.taskPosition;
     var final = null;
-    var signalMatch = new RegExp(constants_1.signal);
     new Promise(function run(resolve, reject) {
         runner.stdout.on('data', function onData(data) {
             data = data.toString();
diff --git a/lib/writeTests/compiler.js b/lib/writeTests/compiler.js
diff --git a/lib/writeTests/helpers/babel-register.js b/lib/writeTests/helpers/babel-register.js
@@ -1,4 +1,4 @@
 "use strict";
-var babelRegister = "require(\"babel-register\")({\"plugins\": [[\"transform-es2015-modules-commonjs\",{\"strict\":true,\"loose\":true}]]});\n\n";
+var babelRegister = "// run time compiler\nrequire('babel-core/register')({plugins: [['transform-es2015-modules-commonjs',{\nloose:true}]]});\n\n";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = babelRegister;
diff --git a/lib/writeTests/helpers/compiler.js b/lib/writeTests/helpers/compiler.js
@@ -1,12 +0,0 @@
-"use strict";
-var ts = require('typescript');
-function compiler(str) {
-    return ts.transpile(str, {
-        module: ts.ModuleKind.CommonJS,
-        target: 'es5',
-        allowJs: true,
-        allowUnreachableCode: true,
-    });
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = compiler;
diff --git a/lib/writeTests/helpers/rewire.js b/lib/writeTests/helpers/rewire.js
@@ -0,0 +1,4 @@
+"use strict";
+var rewire = "require = require('rewire');";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = rewire;
diff --git a/lib/writeTests/index.js b/lib/writeTests/index.js
@@ -4,15 +4,18 @@ var process_console_log_1 = require('process-console-log');
 var import_paths_1 = require('./import-paths');
 var exists_1 = require('./helpers/exists');
 var babel_register_1 = require('./helpers/babel-register');
+var rewire_1 = require('./helpers/rewire');
 function writeTest(_a) {
     var dir = _a.dir, tests = _a.tests, testPath = _a.testPath;
+    var fixImports = import_paths_1.default(dir, tests);
+    var output = '(function(){\n'
+        .concat('// run time compiler\n' + babel_register_1.default)
+        .concat('// override console.log\n' + process_console_log_1.logger)
+        .concat('// file exists function\n' + exists_1.default(dir))
+        .concat('// rewire\n' + rewire_1.default)
+        .concat(fixImports)
+        .concat('\n}());');
     return new Promise(function (resolve, reject) {
-        var fixImports = import_paths_1.default(dir, tests);
-        var output = ''
-            .concat(process_console_log_1.logger)
-            .concat(exists_1.default(dir))
-            .concat(babel_register_1.default)
-            .concat(fixImports);
         fs_1.writeFile(testPath, output, function (err) {
             if (err) {
                 reject(err);
diff --git a/package.json b/package.json
@@ -26,12 +26,14 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
+    "babel-core": "^6.13.2",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.11.5",
+    "babel-preset-es2015": "^6.13.2",
     "babel-register": "^6.11.6",
     "mocha": "^3.0.1",
     "node-file-exists": "^1.1.0",
     "process-console-log": "^0.2.2",
-    "typescript": "^1.8.10"
+    "rewire": "https://github.com/ShMcK/rewire.git"
   },
   "devDependencies": {
     "chai": "^3.5.0",
diff --git a/src/runner/runner-process.ts b/src/runner/runner-process.ts
@@ -32,7 +32,7 @@ export default function spawnRunnerProcess({dir, taskPosition, testPath}) {
     '--harmony', // es6 features
     '--no-colors',
     '--timeout=3000',
-    '--require babelhook', // for import/export of modules
+    '--compilers js:babel-core/register', // for import/export of modules
     `--reporter=${reporterPath}`, // test feedback
     testPath, // unit tests
   ], options);
diff --git a/src/runner/start-runner.ts b/src/runner/start-runner.ts
@@ -1,13 +1,13 @@
 import {parseLog} from 'process-console-log';
 import {signal} from '../constants';
 
-export default function startRunner(runner, handleResult) {
+// take code after the signal to avoid confusing console.log statements
+// with test output
+const signalMatch = new RegExp(signal);
 
-  var final = null;
+export default function startRunner({runner, handleResult, taskPosition}) {
 
-  // take code after the signal to avoid confusing console.log statements
-  // with test output
-  const signalMatch = new RegExp(signal);
+  var final = null;
 
   new Promise(function run(resolve, reject) {
 
@@ -45,7 +45,7 @@ export default function startRunner(runner, handleResult) {
         console.log('error processing result: ', result);
       }
 
-      final.change = final.taskPosition - config.taskPosition;
+      final.change = final.taskPosition - taskPosition;
       final.pass = final.change > 0;
       final.completed = result.pass;
 
diff --git a/src/writeTests/compiler.ts b/src/writeTests/compiler.ts
@@ -0,0 +1,11 @@
+// import * as ts from 'typescript';
+//
+// // run code through TS compiler with options
+// export default function compiler(str: string): string {
+//   return ts.transpile(str, {
+//     module: ts.ModuleKind.CommonJS,
+//     target: 'es5',
+//     allowJs: true,
+//     allowUnreachableCode: true,
+//   });
+// }
diff --git a/src/writeTests/helpers/babel-register.ts b/src/writeTests/helpers/babel-register.ts
@@ -1,2 +1,4 @@
-const babelRegister = `require("babel-register")({"plugins": [["transform-es2015-modules-commonjs",{"strict":true,"loose":true}]]});\n\n`;
+const babelRegister = `// run time compiler
+require('babel-core/register')({plugins: [['transform-es2015-modules-commonjs',{
+loose:true}]]});\n\n`;
 export default babelRegister;
diff --git a/src/writeTests/helpers/compiler.ts b/src/writeTests/helpers/compiler.ts
diff --git a/src/writeTests/helpers/exists.ts b/src/writeTests/helpers/exists.ts
@@ -1,6 +1,3 @@
-// checks if file exists from cwd
-// appends this function to the top of the tests
-// require('node-file-exists')(require('path').;
 export default function(projectDir) {
   return `function fileExists(e,r){void 0===r&&(r=!0);try{accessSync(e,F_OK)}catch(c){if(c)return r||console.log(c),!1}return!0}var _require=require("fs"),accessSync=_require.accessSync,F_OK=_require.F_OK,_require2=require("path"),resolve=_require2.resolve;function exists(p){return fileExists(resolve('${projectDir}',p))}\n\n`;
 }
diff --git a/src/writeTests/helpers/rewire.ts b/src/writeTests/helpers/rewire.ts
@@ -0,0 +1,2 @@
+const rewire = `require = require('rewire');`;
+export default rewire;
diff --git a/src/writeTests/index.ts b/src/writeTests/index.ts
@@ -2,26 +2,30 @@ import {writeFile} from 'fs';
 import {logger} from 'process-console-log';
 import importPaths from './import-paths';
 import exists from './helpers/exists';
-// import compiler from './helpers/compiler';
+// import compiler from './compiler';
 import babelRegister from './helpers/babel-register';
+import rewire from './helpers/rewire';
 
-export default function writeTest({ dir, tests, testPath }: CombineTestsOptions) {
-  return new Promise((resolve, reject) => {
+export default function writeTest({ dir, tests, testPath }) {
 
-    // fix import paths relative to project dir instead of test runner
-    const fixImports = importPaths(dir, tests);
-    // const compiled = compiler(fixImports);
+  // fix import paths relative to project dir instead of test runner
+  const fixImports = importPaths(dir, tests);
+  // const compiled = compiler(fixImports);
 
-    const output = ''
-        // append logger
-        .concat(logger)
-        // exists polyfill for file/folder exists checks
-        .concat(exists(dir))
-        // babel hook to handle import / export in other files
-        .concat(babelRegister)
-        // compile using ts
-        .concat(fixImports);
+  const output = '(function(){\n'
+      // babel hook to handle import / export in other files
+      .concat('// run time compiler\n' + babelRegister)
+      // append logger for capturing log values and types
+      .concat('// override console.log\n' + logger)
+      // exists polyfill for file/folder exists checks
+      .concat('// file exists function\n' + exists(dir))
+      // allow access to module globals
+      .concat('// rewire\n' + rewire)
+      // fixed imports
+      .concat(fixImports)
+      .concat('\n}());');
 
+  return new Promise((resolve, reject) => {
 		// write test file
     writeFile(testPath, output, (err) => {
       if (err) { reject(err); }
diff --git a/tsconfig.json b/tsconfig.json
@@ -35,9 +35,10 @@
         "src/typings/process-console-log/index.d.ts",
         "src/typings/set/set.d.ts",
         "src/typings/tsd.d.ts",
+        "src/writeTests/compiler.ts",
         "src/writeTests/helpers/babel-register.ts",
-        "src/writeTests/helpers/compiler.ts",
         "src/writeTests/helpers/exists.ts",
+        "src/writeTests/helpers/rewire.ts",
         "src/writeTests/import-paths.ts",
         "src/writeTests/index.ts"
     ],
