improved log handling

Author: ShMcK

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha-coderoad",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "mocha test runner & reporter for atom-coderoad",
   "main": "src/runner.js",
   "scripts": {

src/runner.js

@@ -8,17 +8,13 @@ function runner(testFile, config, handleResult, handleLog) {
     var signalMatch = new RegExp(utils_1.signal);
     return new Promise(function (resolve, reject) {
         runner.stdout.on('data', function (data) {
+            data = data.toString();
             var match = signalMatch.exec(data);
             if (!match) {
-                throw 'Result test data doesn\'t match signal string', data.toString();
+                handleLog(data);
+                return;
             }
-            if (match.index > 0) {
-                var log = data.toString().substring(0, match.index);
-                if (!!log.length) {
-                    handleLog(log);
-                }
-            }
-            var resultString = data.toString().substring(match.index + utils_1.signal.length);
+            var resultString = data.substring(match.index + utils_1.signal.length);
             var result = JSON.parse(JSON.stringify(resultString));
             if (typeof result === 'string') {
                 result = JSON.parse(result);

test/result-fail.spec.js

@@ -17,6 +17,8 @@ describe('result-failure', function() {
     var file = path.join(__dirname, 'tests', 'fail-01.js');
     var run = getRunner(file);
     var expected = {
+      change: 0,
+      pass: false,
       taskPosition: 0,
       msg: 'fail-01 should fail',
       timedOut: false
@@ -32,6 +34,7 @@ xit('returns taskPosition 1 if second test fails', function() {
   var run = getRunner(files);
   var expected = {
     pass: false,
+    change: 1,
     taskPosition: 1,
     failedAtFile: path.join(config.tutorialDir, 'fail-01.js'),
     msg: 'fail-01 should fail'
@@ -47,6 +50,7 @@ xit('returns taskPosition 3 if fourth test fails', function() {
   var run = getRunner(files);
   var expected = {
     pass: false,
+    change: 3,
     taskPosition: 3,
     failedAtFile: path.join(config.tutorialDir, 'fail-01.js'),
     msg: 'fail-01 should fail'
@@ -62,6 +66,7 @@ xit('returns taskPosition 0 if any of the first tests fail', function () {
     var run = getRunner(files);
     var expected = {
       pass: false,
+      change: 0,
       taskPosition: 0,
       failedAtFile: path.join(config.tutorialDir, 'fail-01.js'),
       msg: 'fail-01 should fail'
@@ -77,6 +82,7 @@ xit('returns the taskPosition at the correct point with arrays of tests', functi
   var run = getRunner(files);
   var expected = {
     pass: false,
+    change: 2,
     taskPosition: 2,
     failedAtFile: path.join(config.tutorialDir, 'fail-01.js'),
     msg: 'fail-01 should fail'

test/result-pass.spec.js

@@ -14,6 +14,8 @@ describe('result-pass', function() {
     var file = path.join(__dirname, 'tests', 'pass-01.js');
     var run = getRunner(file);
     var expected = {
+      change: 1,
+      pass: true,
       taskPosition: 1,
       msg: 'Task 1 Complete'
     };
@@ -29,6 +31,8 @@ describe('result-pass', function() {
     var file = concatTests(path.join(__dirname, 'temp', 'pass02.js'), tests);
     var run = getRunner(file);
     var expected = {
+      change: 3,
+      pass: true,
       taskPosition: 3,
       msg: 'Task 3 Complete'
     };

test/runner.spec.js

@@ -19,6 +19,8 @@ describe('runner', function() {
     var file = path.join(__dirname, 'tests', 'env-vars.js');
     var run = getRunner(file);
     var expected = {
+      change: 1,
+      pass: true,
       taskPosition: 1,
       msg: 'Task 1 Complete'
     };

test/temp/pass02.js

@@ -4,7 +4,8 @@ var runner = require('../../src/runner').default;
 var rootDir = __dirname.split('/');
 var config = {
   dir: rootDir.slice(0, rootDir.length - 1).join('/'),
-  tutorialDir: path.join(__dirname, '..', '/tests')
+  tutorialDir: path.join(__dirname, '..', '/tests'),
+  taskPosition: 0
 };
 function handleLog(log) {
   return log;