cleanup, types

Author: ShMcK

.npmignore

@@ -1,6 +1,7 @@
 test
 node_modules
 .cache
+report.json
 tsconfig.json
 tslint.json
 src

lib/create-runner.js

@@ -1,6 +1,5 @@
 "use strict";
 var path = require('path');
-require('./loaders');
 var spawn = require('child_process').spawn;
 var node = null;
 if (process.platform === 'darwin' && process.resourcesPath) {
@@ -20,9 +19,6 @@ function createRunner(config, testFile) {
         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;
     return spawn(node, [
         'py.test',
         '--json=report.json',

lib/runner.js

@@ -10,7 +10,6 @@ function runner(testFile, config, handleResult) {
     return new Promise(function (resolve, reject) {
         runner.stdout.on('data', function (data) {
             data = data.toString();
-            console.log(data);
             if (!exists_1.default(pathToResults)) {
                 console.log('error finding test output file: ', data);
                 return;

src/create-runner.ts

@@ -1,5 +1,4 @@
 import * as path from 'path';
-import './loaders';
 const spawn = require('child_process').spawn;
 
 // get absolute path to node exec
@@ -21,9 +20,6 @@ export function createRunner(config: CR.Config, testFile: string) {
     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;
 
   // spawn child process calling test runner
   return spawn(node, [

src/parse-json.ts

@@ -1,14 +1,7 @@
-let final = null;
+let final: ParseFinal = null;
 const testNumber = /::Test([0-9]+)/;
 const testMessage = /::test_(.+)$/;
 
-interface ParseFinal {
-  complete: boolean;
-  msg: string;
-  taskPosition: number;
-  timedOut?: boolean;
-}
-
 function formatFailureMessage(message: string): string {
   return message.split('_').join(' ');
 }
@@ -20,8 +13,8 @@ export function parseJson(pathToResults: string): ParseFinal {
     return;
   }
 
-  let finalIndex = result.report.summary.num_tests - 1;
-  let finalTest = result.report.tests.find(function(test) {
+  let finalIndex: number = result.report.summary.num_tests - 1;
+  let finalTest: PyTest = result.report.tests.find(function(test: PyTest) {
     return test.run_index === finalIndex;
   });
   let taskPosition: number = parseInt(finalTest.name.match(testNumber)[1], 10);
@@ -31,7 +24,7 @@ export function parseJson(pathToResults: string): ParseFinal {
     return;
   }
 
-  let failed = result.report.summary.failed > 0;
+  let failed: boolean = result.report.summary.failed > 0;
 
   if (!failed) {
     // pass

src/runner.ts

@@ -15,16 +15,13 @@ export default function runner(testFile: string, config: CR.Config,
     runner.stdout.on('data', function(data): void {
 
       data = data.toString();
-      console.log(data);
-
-      /* Result */
-      // transform string result into object
 
       if (!exists(pathToResults)) {
         console.log('error finding test output file: ', data);
         return;
       }
 
+      // transform data;
       final = parseJson(pathToResults);
       final.change = final.taskPosition - config.taskPosition;
       final.pass = final.change > 0;

src/typings/cr/globals.d.ts

@@ -1,15 +1,21 @@
-interface Global {
-  loadEditor: (pathToContext: string, options?: Object) => void;
-  loadGlobal: (name: string, pathToContext: string) => void;
+interface ParseFinal {
+  completed: boolean;
+  msg: string;
+  taskPosition: number;
+  timedOut?: boolean;
 }
 
-interface ObjectConstructor {
-  assign(target: any, ...sources: any[]): any;
-}
-
-declare var global: Global;
-
-declare module 'babel-core' {
-  var babel: any;
-  export default babel;
+interface PyTest {
+  name: string;
+  teardown: Object;
+  setup: Object;
+  run_index: number;
+  call: {
+    duration: number;
+    outcome: string;
+    name: string;
+    longrepr: string;
+  };
+  duration: number;
+  outcome: string;
 }