extract handle-result

Author: ShMcK

lib/modules/tests/test-run/test-result.js renamed to lib/modules/tests/test-run/handle-result.js

@@ -4,5 +4,6 @@ var actions_1 = require('../actions');
 function handleResult(result) {
     store_1.default.dispatch(actions_1.testComplete(result));
 }
-exports.handleResult = handleResult;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = handleResult;
 ;

lib/modules/tests/test-run/run.js

@@ -1,21 +1,17 @@
 "use strict";
-var test_result_1 = require('./test-result');
-var fs_1 = require('fs');
-var path_1 = require('path');
 var parse_loaders_1 = require('./parse-loaders');
+var handle_result_1 = require('./handle-result');
 function runTaskTests(taskTests, dir, tutorial, taskPosition) {
     var tests = taskTests;
     if (tests && tests.length) {
         var tutorialConfig = tutorial.config;
         var output = parse_loaders_1.default(tests, tutorialConfig.testSuffix, tutorial, dir);
-        var target = path_1.join(tutorialConfig.dir || dir, ".tmp" + tutorialConfig.testSuffix);
-        fs_1.writeFileSync(target, output, 'utf8');
         var config = {
             dir: dir,
             tutorialDir: tutorialConfig.dir,
             taskPosition: taskPosition
         };
-        tutorialConfig.run(target, config, test_result_1.handleResult);
+        tutorialConfig.run(output, config, handle_result_1.default);
     }
     return true;
 }

src/modules/tests/test-run/test-result.ts renamed to src/modules/tests/test-run/handle-result.ts

@@ -2,6 +2,6 @@ import store from '../../../store';
 import {testComplete} from '../actions';
 
 // function is passed into the test runner and called on completion
-export function handleResult(result: Test.Result): void {
+export default function handleResult(result: Test.Result): void {
   store.dispatch(testComplete(result));
 };

src/modules/tests/test-run/run.ts

@@ -1,7 +1,6 @@
-import {handleResult} from './test-result';
-import {writeFileSync} from 'fs';
 import {join} from 'path';
 import parseLoaders from './parse-loaders';
+import handleResult from './handle-result';
 
 export default function runTaskTests(
   taskTests: string, dir: string, tutorial: CR.Tutorial, taskPosition: number
@@ -14,21 +13,14 @@ export default function runTaskTests(
       tests, tutorialConfig.testSuffix, tutorial, dir
     );
 
-    // write temporary test file in tutorial directory
-    let target = join(
-      tutorialConfig.dir || dir,
-      `.tmp${tutorialConfig.testSuffix}`
-    );
-    writeFileSync(target, output, 'utf8');
-
     const config: Test.Config = {
       dir,
       tutorialDir: tutorialConfig.dir,
       taskPosition
     };
 
     // call test runner
-    tutorialConfig.run(target, config, handleResult);
+    tutorialConfig.run(output, config, handleResult);
   }
   return true;
 }

src/typings/cr/test.d.ts

@@ -13,4 +13,9 @@ declare namespace Test {
     tutorialDir: string;
     taskPosition: number;
   }
+
+  interface Log {
+    type: string;
+    output: any;
+  }
 }

tsconfig.json

@@ -111,10 +111,10 @@
         "src/modules/tests/actions.ts",
         "src/modules/tests/index.ts",
         "src/modules/tests/task-position/index.ts",
+        "src/modules/tests/test-run/handle-result.ts",
         "src/modules/tests/test-run/index.ts",
         "src/modules/tests/test-run/parse-loaders.ts",
         "src/modules/tests/test-run/run.ts",
-        "src/modules/tests/test-run/test-result.ts",
         "src/modules/tests/types.ts",
         "src/modules/tutorial/actions.ts",
         "src/modules/tutorial/index.ts",