remove taskTests reducer, move into test run and load

ShMcK · ShMcK · commit b5178c1129fd · 2016-09-11T13:54:32.000-07:00
diff --git a/.eslintrc b/.eslintrc
@@ -1 +1,11 @@
-{}
+{
+  "es6": true,
+  "jest": true,
+  "env": {
+    "node": true,
+    "browser": true
+  },
+  "rules": {
+     "quotes": ["warning", "single"]
+  }
+}
diff --git a/lib/modules/page/index.js b/lib/modules/page/index.js
@@ -3,5 +3,3 @@ var page_position_1 = require('./page-position');
 exports.pagePosition = page_position_1.default;
 var task_actions_1 = require('./task-actions');
 exports.taskActions = task_actions_1.default;
-var task_tests_1 = require('./task-tests');
-exports.taskTests = task_tests_1.default;
diff --git a/lib/modules/page/task-tests/index.js b/lib/modules/page/task-tests/index.js
@@ -5,7 +5,7 @@ function taskTestsReducer(taskTests, action) {
     if (taskTests === void 0) { taskTests = ''; }
     switch (action.type) {
         case types_1.PAGE_SET:
-            var _a = action.payload, tutorial = _a.tutorial, tasks = _a.tasks;
+            var tasks = action.payload.tasks;
             return [].concat.apply([], tasks.map(function (task) { return task.tests || []; })).reduce(function (output, file) {
                 try {
                     output += fs_1.readFileSync(file, 'utf8') + '\n';
diff --git a/lib/modules/tests/actions.js b/lib/modules/tests/actions.js
@@ -4,12 +4,13 @@ var testName_1 = require('./test-run/testName');
 var types_1 = require('./types');
 function testLoad() {
     return function (dispatch, getState) {
-        var _a = getState(), dir = _a.dir, pagePosition = _a.pagePosition, tutorial = _a.tutorial, taskTests = _a.taskTests;
+        var _a = getState(), dir = _a.dir, pagePosition = _a.pagePosition, tutorial = _a.tutorial;
+        var tasks = tutorial.pages[pagePosition].tasks || [];
         var testFile = testName_1.default({ tutorial: tutorial, pagePosition: pagePosition });
         dispatch({
             type: types_1.TEST_LOAD, payload: {
                 dir: dir,
-                tests: taskTests,
+                tasks: tasks,
                 load: tutorial.config.load,
                 testFile: testFile,
             }
@@ -23,11 +24,13 @@ function testRun() {
         if (timeSinceLastTestRun < 1000) {
             return;
         }
-        var _a = getState(), taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition, pagePosition = _a.pagePosition;
+        var _a = getState(), dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition, pagePosition = _a.pagePosition;
+        var tasks = tutorial.pages[pagePosition].tasks;
+        var hasTasks = tasks && tasks.length > 0;
         var testFile = testName_1.default({ tutorial: tutorial, pagePosition: pagePosition });
         dispatch({
             type: types_1.TEST_RUN,
-            payload: { taskTests: taskTests, dir: dir, tutorial: tutorial, taskPosition: taskPosition, testFile: testFile }
+            payload: { hasTasks: hasTasks, dir: dir, tutorial: tutorial, taskPosition: taskPosition, testFile: testFile }
         });
     };
 }
diff --git a/lib/modules/tests/test-run/load.js b/lib/modules/tests/test-run/load.js
@@ -1,6 +1,16 @@
 "use strict";
+var fs_1 = require('fs');
 function loadTaskTests(_a) {
-    var dir = _a.dir, tests = _a.tests, load = _a.load, testFile = _a.testFile;
+    var dir = _a.dir, tasks = _a.tasks, load = _a.load, testFile = _a.testFile;
+    var tests = [].concat.apply([], tasks.map(function (task) { return task.tests || []; })).reduce(function (output, file) {
+        try {
+            output += fs_1.readFileSync(file, 'utf8') + '\n';
+        }
+        catch (e) {
+            console.log('Error reading test file', e);
+        }
+        return output;
+    }, '');
     load({ dir: dir, tests: tests, testFile: testFile });
 }
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/lib/modules/tests/test-run/run.js b/lib/modules/tests/test-run/run.js
@@ -1,8 +1,8 @@
 "use strict";
 var handle_result_1 = require('./handle-result');
 function runTaskTests(_a) {
-    var taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition, testFile = _a.testFile;
-    if (taskTests && taskTests.length) {
+    var hasTasks = _a.hasTasks, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition, testFile = _a.testFile;
+    if (hasTasks) {
         tutorial.config.run({ dir: dir, taskPosition: taskPosition, handleResult: handle_result_1.default, testFile: testFile });
     }
     return performance.now();
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -17,5 +17,5 @@ exports.default = redux_1.combineReducers({
     alert: alert_1.default, checks: setup_1.checks, editor: editor_1.reducer, dir: dir_1.default, hintPosition: hints_1.default,
     packageJson: setup_1.packageJson, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: route_1.reducer,
     tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
-    taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, taskTests: page_1.taskTests, testRun: tests_1.testRun, window: window_1.reducer
+    taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, testRun: tests_1.testRun, window: window_1.reducer
 });
diff --git a/src/modules/page/index.ts b/src/modules/page/index.ts
@@ -1,3 +1,2 @@
 export {default as pagePosition} from './page-position';
 export {default as taskActions} from './task-actions';
-export {default as taskTests} from './task-tests';
diff --git a/src/modules/page/task-tests/index.ts b/src/modules/page/task-tests/index.ts
diff --git a/src/modules/page/task-tests/reducer.test.ts b/src/modules/page/task-tests/reducer.test.ts
diff --git a/src/modules/tests/actions.ts b/src/modules/tests/actions.ts
@@ -4,12 +4,13 @@ import {TEST_COMPLETE, TEST_LOAD, TEST_RESULT, TEST_RUN} from './types';
 
 export function testLoad(): Redux.ThunkAction<any, any, {}> {
   return (dispatch, getState): void => {
-    const { dir, pagePosition, tutorial, taskTests } = getState();
+    const { dir, pagePosition, tutorial } = getState();
+    const tasks = tutorial.pages[pagePosition].tasks || [];
     const testFile = getTestName({tutorial, pagePosition});
     dispatch({
       type: TEST_LOAD, payload: {
         dir,
-        tests: taskTests,
+        tasks,
         load: tutorial.config.load,
         testFile,
       }
@@ -24,12 +25,14 @@ export function testRun(): Redux.ThunkAction<any, any, {}> {
     if (timeSinceLastTestRun < 1000) {
       return;
     }
-    const {taskTests, dir, tutorial, taskPosition, pagePosition} = getState();
+    const {dir, tutorial, taskPosition, pagePosition} = getState();
+    const tasks = tutorial.pages[pagePosition].tasks;
+    const hasTasks = tasks && tasks.length > 0;
     const testFile = getTestName({tutorial, pagePosition});
 
     dispatch({
       type: TEST_RUN,
-      payload: { taskTests, dir, tutorial, taskPosition, testFile }
+      payload: { hasTasks, dir, tutorial, taskPosition, testFile }
     });
   };
 }
diff --git a/src/modules/tests/test-run/load.ts b/src/modules/tests/test-run/load.ts
@@ -1,3 +1,21 @@
-export default function loadTaskTests({dir, tests, load, testFile}) {
+import { readFileSync } from 'fs';
+
+export default function loadTaskTests({dir, tasks, load, testFile}) {
+  
+  // map over task tests from coderoad.json
+  const tests = [].concat.apply([], tasks.map(
+      task => task.tests || []
+    )
+  // concat test files together
+  ).reduce((output: string, file: string): string => {
+    try {
+      output += readFileSync(file, 'utf8') + '\n';
+    } catch (e) {
+      console.log('Error reading test file', e);
+    }
+    // return concatenated test files
+    return output;
+  }, '');
+  
   load({dir, tests, testFile});
 }
diff --git a/src/modules/tests/test-run/parse-loaders.ts b/src/modules/tests/test-run/parse-loaders.ts
diff --git a/src/modules/tests/test-run/run.ts b/src/modules/tests/test-run/run.ts
@@ -1,10 +1,10 @@
 import handleResult from './handle-result';
 
 export default function runTaskTests({
-  taskTests, dir, tutorial, taskPosition, testFile
+  hasTasks, dir, tutorial, taskPosition, testFile
 }): number {
 
-  if (taskTests && taskTests.length) {
+  if (hasTasks) {
     // call test runner
     tutorial.config.run({dir, taskPosition, handleResult, testFile});
   }
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -5,7 +5,7 @@ import {default as alert} from './modules/alert';
 import {default as dir} from './modules/dir';
 import {reducer as editor} from './modules/editor';
 import {default as hintPosition} from './modules/hints';
-import {pagePosition, taskActions, taskTests} from './modules/page';
+import {pagePosition, taskActions} from './modules/page';
 import {reducer as progress} from './modules/progress';
 import {reducer as route} from './modules/route';
 import {checks, packageJson} from './modules/setup';
@@ -18,5 +18,5 @@ export default combineReducers({
   alert, checks, editor, dir, hintPosition,
   packageJson, pagePosition, progress, route,
   tutorial, tutorials,
-  taskActions, taskPosition, taskTests, testRun, window
+  taskActions, taskPosition, testRun, window
 });
diff --git a/src/typings/coderoad/index.d.ts b/src/typings/coderoad/index.d.ts
@@ -27,7 +27,6 @@ declare namespace CR {
     page: Page;
     progress: Progress;
     tasks: Task[];
-    taskTests: string[];
     taskPosition: number;
     hintPosition: number;
     taskActions: string[];

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`export {default as pagePosition} from './page-position';`
`2`	`2`	`export {default as taskActions} from './task-actions';`
`3`		`-export {default as taskTests} from './task-tests';`