move test write into test runner, test runner accepts string

Author: ShMcK

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.7.0] -
+- improved console logger
+
 ## [0.6.0] - 2016-04-01
 - loaders are now internal to Atom-Coderoad
 

lib/.tmp.js

@@ -0,0 +1,68 @@
+/// coderoad-test-file
+
+
+
+
+var expect = require('chai').expect;
+
+global.something = {
+  some: 'data'
+};
+
+// addOne
+function addOne(x) {
+	return x + 1;
+}
+
+// subtractOne
+function subtractOne(x) {
+	return x - 1
+}
+
+
+describe('01 addOne', function() {
+
+	it('doesn\'t exist', function() {
+		expect(addOne).to.be.defined;
+	});
+
+	it('should take a parameter', function() {
+		expect(addOne).to.have.length(1);
+	});
+
+	it('doesn\'t return anything', function() {
+		expect(addOne(1)).to.exist;
+	});
+
+	it('should output a number', function() {
+		expect(addOne(1)).to.be.a('number');
+	});
+
+	it('doesn\'t add 1 + 1', function() {
+		expect(addOne(1)).to.equal(2);
+		expect(addOne(10)).to.equal(11);
+	});
+
+});
+
+describe('02 subtractOne', function() {
+
+  it('doesn\'t exist', function () {
+    expect(subtractOne).to.be.defined;
+  });
+
+  it('should take a parameter', function() {
+    expect(subtractOne).to.have.length(1);
+  });
+
+  it('should output a number', function () {
+    expect(subtractOne(1)).to.be.a('number');
+  });
+
+  it('doesn\'t subtract 1', function() {
+    expect(subtractOne(1)).to.equal(0);
+    expect(subtractOne(10)).to.equal(9);
+  });
+
+});
+

lib/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+var path_1 = require('path');
+exports.signal = '@@@CodeRoad Results@@@';
+exports.testPath = path_1.join(__dirname, '.tmp.js');

lib/create-runner.js

@@ -1,24 +1,26 @@
 "use strict";
-var utils_1 = require('./utils');
-var create_runner_1 = require('./create-runner');
-function runner(testFile, config, handleResult) {
-    var runner = create_runner_1.createRunner(config, testFile);
+var constants_1 = require('./constants');
+var runner_process_1 = require('./runner-process');
+var write_test_1 = require('./write-test');
+function runner(testString, config, handleResult) {
+    write_test_1.default(testString);
+    var runner = runner_process_1.default(config);
     var final = null;
-    var signalMatch = new RegExp(utils_1.signal);
-    return new Promise(function (resolve, reject) {
-        runner.stdout.on('data', function (data) {
+    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 {
-                    console.dir(JSON.parse(JSON.stringify(data)));
+                    console.log(data);
                 }
                 catch (e) {
                     console.log(data);
                 }
                 return;
             }
-            var resultString = data.substring(match.index + utils_1.signal.length);
+            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);
@@ -37,16 +39,11 @@ function runner(testFile, config, handleResult) {
             final.completed = result.pass;
             handleResult(final);
         });
-        runner.stderr.on('data', function (data) {
+        runner.stderr.on('data', function onError(data) {
             console.log('test error', data.toString());
         });
-        runner.on('close', function (code) {
-            if (code === 0) {
-                resolve(final);
-            }
-            else {
-                resolve(final);
-            }
+        runner.on('close', function onClose(code) {
+            resolve(final);
         });
     });
 }

lib/exists.js

@@ -1,18 +1,18 @@
 "use strict";
-var utils_1 = require('./utils');
+var constants_1 = require('./constants');
 exports = module.exports = reporter;
 function reporter(runner) {
     var result = {
         passes: [],
         failures: [],
-        pass: true
+        pass: true,
     };
     runner.on('pass', function (test) {
         var title = test.fullTitle();
         var obj = getIndexAndTitle(title);
         result.passes.push({
             msg: "Task " + obj.index + " Complete",
-            taskPosition: obj.index
+            taskPosition: obj.index,
         });
     });
     runner.on('fail', function (test, err) {
@@ -21,12 +21,12 @@ function reporter(runner) {
         result.failures.push({
             msg: obj.msg,
             taskPosition: obj.index - 1,
-            timedOut: test.timedOut
+            timedOut: test.timedOut,
         });
         result.pass = false;
     });
     runner.on('end', function () {
-        process.stdout.write(utils_1.signal + JSON.stringify(result, null, 2));
+        process.stdout.write(constants_1.signal + JSON.stringify(result, null, 2));
     });
     function getIndexAndTitle(title) {
         var indexString = title.match(/^[0-9]+/);
@@ -35,7 +35,7 @@ function reporter(runner) {
         }
         return {
             index: parseInt(indexString[0], 10),
-            msg: title.slice(indexString[0].length + 1)
+            msg: title.slice(indexString[0].length + 1),
         };
     }
 }

lib/runner.js renamed to lib/index.js

@@ -0,0 +1,49 @@
+"use strict";
+var path_1 = require('path');
+var child_process_1 = require('child_process');
+var node_file_exists_1 = require('node-file-exists');
+var constants_1 = require('./constants');
+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;
+}
+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;
+}
+var node = getNode();
+var mocha = getMocha();
+function runnerProcess(config) {
+    var options = {
+        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.dir;
+    options.env.TASK_POSITION = config.taskPosition;
+    return child_process_1.spawn(node, [
+        mocha,
+        '--bail',
+        '--harmony',
+        '--no-colors',
+        ("--reporter=" + path_1.join(__dirname, 'reporter.js')),
+        constants_1.testPath
+    ], options);
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = runnerProcess;

lib/logger.js

@@ -0,0 +1,8 @@
+"use strict";
+var fs_1 = require('fs');
+var constants_1 = require('./constants');
+function writeTest(output) {
+    fs_1.writeFileSync(constants_1.testPath, output, 'utf8');
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = writeTest;

lib/reporter.js

@@ -1,8 +1,8 @@
 {
   "name": "mocha-coderoad",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "mocha test runner & reporter for atom-coderoad",
-  "main": "lib/runner.js",
+  "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -26,7 +26,9 @@
   },
   "homepage": "https://github.com/coderoad/mocha-coderoad#readme",
   "dependencies": {
-    "mocha": "2.4.5"
+    "mocha": "2.4.5",
+    "process-console-log": "^0.2.0",
+    "node-file-exists": "^0.1.0"
   },
   "devDependencies": {
     "chai": "^3.5.0",

lib/runner-process.js

@@ -0,0 +1,4 @@
+import {join} from 'path';
+
+export const signal = '@@@CodeRoad Results@@@';
+export const testPath = join(__dirname, '.tmp.js');