load with object

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.8.0] - 2016-06-28
+- load with object
+
 ## [0.7.0] - 2016-05-23
 - improved console logger
 

lib/index.js

@@ -3,7 +3,8 @@ var constants_1 = require('./constants');
 var runner_process_1 = require('./runner-process');
 var write_test_1 = require('./write-test');
 var process_console_log_1 = require('process-console-log');
-function runner(testString, config, handleResult) {
+function runner(_a) {
+    var testString = _a.testString, config = _a.config, handleResult = _a.handleResult;
     write_test_1.default(testString);
     var runner = runner_process_1.default(config);
     var final = null;
@@ -26,14 +27,15 @@ function runner(testString, config, handleResult) {
             if (typeof result === 'string') {
                 result = JSON.parse(result);
             }
-            if (result.pass) {
-                final = result.passes[result.passes.length - 1];
-            }
-            else if (result.pass === false) {
-                final = result.failures[0];
-            }
-            else {
-                console.log('error processing result: ', result);
+            switch (result.pass) {
+                case true:
+                    final = result.passes[result.passes.length - 1];
+                    break;
+                case false:
+                    final = result.failures[0];
+                    break;
+                default:
+                    console.log('error processing result: ', result);
             }
             final.change = final.taskPosition - config.taskPosition;
             final.pass = final.change > 0;

lib/reporter.js

@@ -8,19 +8,17 @@ function reporter(runner) {
         pass: true,
     };
     runner.on('pass', function (test) {
-        var title = test.fullTitle();
-        var obj = getIndexAndTitle(title);
+        var index = getIndexAndTitle(test.fullTitle()).index;
         result.passes.push({
-            msg: "Task " + obj.index + " Complete",
-            taskPosition: obj.index,
+            msg: "Task " + index + " Complete",
+            taskPosition: index,
         });
     });
     runner.on('fail', function (test, err) {
-        var title = test.fullTitle();
-        var obj = getIndexAndTitle(title);
+        var _a = getIndexAndTitle(test.fullTitle()), msg = _a.msg, index = _a.index;
         result.failures.push({
-            msg: obj.msg,
-            taskPosition: obj.index - 1,
+            msg: msg,
+            taskPosition: index - 1,
             timedOut: test.timedOut,
         });
         result.pass = false;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha-coderoad",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "mocha test runner & reporter for atom-coderoad",
   "main": "lib/index.js",
   "scripts": {

src/index.ts

@@ -3,11 +3,7 @@ import runnerProcess from './runner-process';
 import writeTest from './write-test';
 import {parseLog} from 'process-console-log';
 
-export default function runner(
-  testString: string,
-  config: CR.Config,
-  handleResult: (result) => CR.TestResult
-) {
+export default function runner({testString, config, handleResult}) {
   // write tests to file
   writeTest(testString);
   // run tests on file
@@ -25,10 +21,8 @@ export default function runner(
 
       if (!match) {
         try {
-          // console.log(data);
           parseLog(data);
         } catch (e) {
-          // console.log(data);
           parseLog(data);
         }
         return;
@@ -38,19 +32,20 @@ export default function runner(
       // 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
+      // why parse twice? it works
       if (typeof result === 'string') {
         result = JSON.parse(result);
       }
 
-      if (result.pass) {
-        // pass
-        final = result.passes[result.passes.length - 1];
-      } else if (result.pass === false) {
-        // fail: return first failure
-        final = result.failures[0];
-      } else {
-        console.log('error processing result: ', result);
+      switch (result.pass) {
+        case true:
+          final = result.passes[result.passes.length - 1];
+          break;
+        case false:
+          final = result.failures[0];
+          break;
+        default:
+          console.log('error processing result: ', result);
       }
 
       final.change = final.taskPosition - config.taskPosition;

src/reporter.ts

@@ -8,23 +8,21 @@ function reporter(runner) {
     pass: true,
   };
 
-  runner.on('pass', function(test: Mocha.ITest) {
-    let title = test.fullTitle();
-    let obj = getIndexAndTitle(title);
+  runner.on('pass', (test: Mocha.ITest) => {
+    const {index} = getIndexAndTitle(test.fullTitle());
     // add pass
     result.passes.push({
-      msg: `Task ${obj.index} Complete`,
-      taskPosition: obj.index,
+      msg: `Task ${index} Complete`,
+      taskPosition: index,
     });
   });
 
-  runner.on('fail', function(test: Mocha.ITest, err: Error) {
-    let title = test.fullTitle();
-    let obj = getIndexAndTitle(title);
+  runner.on('fail', (test: Mocha.ITest, err: Error) => {
+    const {msg, index} = getIndexAndTitle(test.fullTitle());
     // add fail
     result.failures.push({
-      msg: obj.msg,
-      taskPosition: obj.index - 1,
+      msg,
+      taskPosition: index - 1,
       // body: test.body,
       timedOut: test.timedOut,
       // duration: test.duration
@@ -44,7 +42,7 @@ function reporter(runner) {
 
   function getIndexAndTitle(title: string): IndexTitle {
     // tests prefixed with task number: "01 title"
-    let indexString = title.match(/^[0-9]+/);
+    const indexString = title.match(/^[0-9]+/);
     if (!indexString) {
       throw 'Tests should begin with a number, indicating the task number';
     }