use memory instead of read/writes for tests

ShMcK · ShMcK · commit 4e57617d3afc · 2016-04-01T13:39:23.000-07:00
diff --git a/lib/reducers/run-tests/run.js b/lib/reducers/run-tests/run.js
@@ -5,14 +5,12 @@ var fs = require('fs');
 var path = require('path');
 var parse_loaders_1 = require('./parse-loaders');
 function runTaskTests(setup) {
-    var testFile = _base_1.store.getState().taskTests;
-    if (testFile) {
+    var tests = _base_1.store.getState().taskTests;
+    if (tests && tests.length) {
         var config = window.coderoad;
         config.taskPosition = _base_1.store.getState().taskPosition;
-        var fileType = testFile.substr(testFile.lastIndexOf('.') + 1, testFile.length) || null;
-        var tests = fs.readFileSync(testFile, 'utf8');
-        var output = parse_loaders_1.default(tests, fileType);
-        var target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, "_tmp" + window.coderoad.suffix);
+        var output = parse_loaders_1.default(tests, window.coderoad.suffix);
+        var target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, "_tmp." + window.coderoad.suffix);
         fs.writeFileSync(target, output, 'utf8');
         window.coderoad.runner(target, config, test_result_1.handleResult);
     }
diff --git a/lib/reducers/task-tests/loader.js b/lib/reducers/task-tests/loader.js
diff --git a/lib/reducers/task-tests/task-tests.js b/lib/reducers/task-tests/task-tests.js
@@ -1,14 +1,21 @@
-'use strict';
-var path = require('path');
+"use strict";
+var fs = require('fs');
 var Type = require('../../actions/actionTypes');
-var loader_1 = require('./loader');
 function taskTestsReducer(taskTests, action) {
     if (taskTests === void 0) { taskTests = ''; }
     switch (action.type) {
         case Type.SET_PAGE:
-            var target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, "_tmpTests" + window.coderoad.suffix);
-            loader_1.default(target, action.payload.taskTests);
-            return target;
+            var tests_1 = '';
+            action.payload.taskTests.forEach(function (file) {
+                try {
+                    var data = fs.readFileSync(file, 'utf8');
+                    tests_1 += data + '\n';
+                }
+                catch (e) {
+                    console.log('Error reading test file', e);
+                }
+            });
+            return tests_1;
         default:
             return taskTests;
     }
diff --git a/lib/services/setGlobals.js b/lib/services/setGlobals.js
@@ -4,7 +4,7 @@ var exists_1 = require('./exists');
 function setGlobals(config) {
     window.coderoad = Object.assign(window.coderoad, {
         tutorial: config.name,
-        suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.'), config.config.testSuffix.length),
+        suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.') + 1, config.config.testSuffix.length),
         tutorialDir: path.join(window.coderoad.dir, 'node_modules', config.name, config.config.testDir),
         testRunner: config.config.testRunner,
         testRunnerOptions: config.config.testRunnerOptions || {}
diff --git a/src/reducers/run-tests/run.ts b/src/reducers/run-tests/run.ts
@@ -4,20 +4,16 @@ import * as fs from 'fs';
 import * as path from 'path';
 import parseLoaders from './parse-loaders';
 
-// TODO: use memcache for test files instead of read/writes
-
 export function runTaskTests(setup?: boolean): boolean {
-  const testFile: string = store.getState().taskTests;
+  const tests: string = store.getState().taskTests;
 
-  if (testFile) {
+  if (tests && tests.length) {
     let config = window.coderoad;
     config.taskPosition = store.getState().taskPosition;
+    let output = parseLoaders(tests, window.coderoad.suffix);
 
-    let fileType: string = testFile.substr(testFile.lastIndexOf('.') + 1, testFile.length) || null;
-    let tests = fs.readFileSync(testFile, 'utf8');
-    let output = parseLoaders(tests, fileType);
-
-    let target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, `_tmp${window.coderoad.suffix}`);
+    // write temporary test file in tutorial directory
+    let target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, `_tmp.${window.coderoad.suffix}`);
     fs.writeFileSync(target, output, 'utf8');
 
     // call test runner
diff --git a/src/reducers/task-tests/concat-tests.ts b/src/reducers/task-tests/concat-tests.ts
diff --git a/src/reducers/task-tests/task-tests.ts b/src/reducers/task-tests/task-tests.ts
@@ -6,9 +6,16 @@ import concatTests from './concat-tests';
 export default function taskTestsReducer(taskTests = '', action: CR.Action): string {
   switch (action.type) {
     case Type.SET_PAGE:
-      let target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, `_tmpTests${window.coderoad.suffix}`);
-      concatTests(target, action.payload.taskTests);
-      return target;
+      let tests = '';
+      action.payload.taskTests.forEach(function(file: string) {
+        try {
+          let data = fs.readFileSync(file, 'utf8');
+          tests += data + '\n';
+        } catch (e) {
+          console.log('Error reading test file', e);
+        }
+      });
+      return tests;
     default:
       return taskTests;
   }
diff --git a/src/services/setGlobals.ts b/src/services/setGlobals.ts
@@ -4,7 +4,7 @@ import {fileExists} from './exists';
 export function setGlobals(config: PackageJson) {
   window.coderoad = Object.assign(window.coderoad, {
     tutorial: config.name,
-    suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.'), config.config.testSuffix.length),
+    suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.') + 1, config.config.testSuffix.length),
     tutorialDir: path.join(window.coderoad.dir, 'node_modules', config.name, config.config.testDir),
     testRunner: config.config.testRunner,
     testRunnerOptions: config.config.testRunnerOptions || {}
diff --git a/tsconfig.json b/tsconfig.json
@@ -84,7 +84,6 @@
     "src/reducers/run-tests/run.ts",
     "src/reducers/run-tests/test-result.ts",
     "src/reducers/task-position/task-position.ts",
-    "src/reducers/task-tests/concat-tests.ts",
     "src/reducers/task-tests/task-tests.ts",
     "src/reducers/tasks/tasks.ts",
     "src/reducers/tutorials/tutorials.ts",
