show ts files

Author: ShMcK

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 tslint.json
-src/*.ts
+src/*.js
 test/**/*.ts
 tsconfig.json
 typings

src/create-runner.js renamed to lib/create-runner.js

@@ -2,14 +2,15 @@
   "name": "mocha-coderoad",
   "version": "0.4.1",
   "description": "mocha test runner & reporter for atom-coderoad",
-  "main": "src/runner.js",
+  "main": "lib/runner.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/coderoad/mocha-coderoad.git"
   },
+  "files": ["lib"],
   "keywords": [
     "coderoad",
     "mocha"

src/reporter.js renamed to lib/reporter.js

@@ -0,0 +1,54 @@
+import * as path from 'path';
+const spawn = require('child_process').spawn;
+
+export function createRunner(config, testFile) {
+  // 1. node electron setup
+  let options: any = {
+    cwd: config.dir
+  };
+  if (options.env == null) {
+    options.env = Object.create(process.env);
+  }
+  options.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE = 1;
+  options.env.DIR = config.dir;
+  options.env.TUTORIAL_DIR = config.tutorialDir;
+  options.env.TASK_POSITION = config.taskPosition;
+
+  // 2. get absolute path to node exec
+  let node = null;
+  if (process.platform === 'darwin' && process.resourcesPath) {
+    node = path.resolve(process.resourcesPath, '..', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Atom Helper');
+  } else {
+    node = process.execPath;
+  }
+
+  // let runnerOptions = []; // setRunnerOptions(config);
+
+  // 3. spawn child process calling mocha test runner
+  return spawn(node, [
+    '/usr/local/bin/mocha',
+    '--bail',
+    '--harmony',
+    '--no-colors',
+    `--reporter=${path.join(__dirname, 'reporter') }`,
+    testFile
+  ], options);
+  // .concat(runnerOptions)
+
+}
+
+// function setRunnerOptions(config) {
+//   let runnerOptions = [];
+//   if (!config.testRunnerOptions) {
+//     return runnerOptions;
+//   }
+//   if (config.testRunnerOptions.babel) {
+//     require('babel-core');
+//     let babelOptions = [
+//       '--require babel-polyfill',
+//       '--compilers js:babel-core/register'
+//     ];
+//     runnerOptions.concat(babelOptions);
+//   }
+//   return runnerOptions;
+// }

src/runner.js renamed to lib/runner.js

@@ -0,0 +1,53 @@
+"use strict";
+import {signal} from './utils';
+
+exports = module.exports = reporter;
+function reporter(runner) {
+  let result = {
+    passes: [],
+    failures: [],
+    pass: true
+  };
+
+  runner.on('pass', function(test) {
+    let title = test.fullTitle();
+    let obj = getIndexAndTitle(title);
+    // add pass
+    result.passes.push({
+      msg: `Task ${obj.index} Complete`,
+      taskPosition: obj.index
+    });
+  });
+
+  runner.on('fail', function(test, err) {
+    let title = test.fullTitle();
+    let obj = getIndexAndTitle(title);
+    // add fail
+    result.failures.push({
+      msg: obj.msg,
+      taskPosition: obj.index - 1,
+      // body: test.body,
+      timedOut: test.timedOut
+      // duration: test.duration
+    });
+    result.pass = false;
+  });
+
+  runner.on('end', function() {
+    // anything before the signal will be captured as log
+    process.stdout.write(signal + JSON.stringify(result, null, 2));
+  });
+
+  function getIndexAndTitle(title: string): { index: number, msg: string } {
+    // tests prefixed with task number: "01 title"
+    let indexString = title.match(/^[0-9]+/);
+    if (!indexString) {
+      throw 'Tests should begin with a number, indicating the task number';
+    }
+    return {
+      index: parseInt(indexString[0]),
+      msg: title.slice(indexString[0].length + 1)
+    };
+  }
+
+}

src/utils.js renamed to lib/utils.js

@@ -0,0 +1,68 @@
+import {signal} from './utils';
+import {createRunner} from './create-runner';
+
+interface Result {
+  msg: string;
+  taskPosition: number;
+  pass: boolean;
+  change: number;
+  failedAtFile?: string;
+  body?: string;
+  timedOut?: boolean;
+  duration?: number;
+};
+
+export default function runner(testFile, config: Config, handleResult, handleLog) {
+
+  let runner = createRunner(config, testFile);
+  var final = null;
+  let signalMatch = new RegExp(signal);
+
+  return new Promise((resolve, reject) => {
+    runner.stdout.on('data', function(data): void {
+
+      data = data.toString();
+      // parse only final output data
+      let match = signalMatch.exec(data); // 0
+
+      if (!match) {
+        handleLog(data);
+        return;
+      }
+
+      /* Result */
+      // transform string result into object
+      let resultString = data.substring(match.index + signal.length);
+      let result = JSON.parse(JSON.stringify(resultString));
+      // why parse twice? I don't know, but it works
+      if (typeof result === 'string') {
+        result = JSON.parse(result);
+      }
+
+      if (!result.pass) {
+        // fail: return first failure
+        final = result.failures[0];
+      } else {
+        // pass
+        final = result.passes[result.passes.length - 1];
+      }
+
+      final.change = final.taskPosition - config.taskPosition;
+      final.pass = final.change > 0;
+      // return result to atom-coderoad
+      handleResult(final);
+    });
+
+    runner.stderr.on('data', function(data) {
+      console.log('test error', data.toString());
+    });
+
+    runner.on('close', function(code) {
+      if (code === 0) {
+        resolve(final);
+      } else {
+        resolve(final);
+      }
+    });
+  });
+}

package.json

@@ -0,0 +1 @@
+export var signal = '@@@CodeRoad Results@@@';