delete TESTS_LOAD, move functionality into PAGE_SET

ShMcK · ShMcK · commit 216a7910176f · 2016-05-08T19:59:46.000-07:00
diff --git a/lib/actions/_types.js b/lib/actions/_types.js
@@ -18,7 +18,6 @@ exports.SETUP_VERIFY = 'SETUP_VERIFY';
 exports.TEST_COMPLETE = 'TEST_COMPLETE';
 exports.TEST_RESULT = 'TEST_RESULT';
 exports.TEST_RUN = 'TEST_RUN';
-exports.TESTS_LOAD = 'TESTS_LOAD';
 exports.TUTORIAL_SET = 'TUTORIAL_SET';
 exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
 exports.TUTORIALS_FIND = 'TUTORIALS_FIND';
diff --git a/lib/actions/config-task-tests.js b/lib/actions/config-task-tests.js
@@ -1,6 +1,6 @@
 "use strict";
 var path_1 = require('path');
-var system_1 = require('../../services/system');
+var system_1 = require('../services/system');
 function configTestString(dir, tutorial, config, name, testPath) {
     if (system_1.isWindows) {
         testPath = testPath.split('/').join('\\');
diff --git a/lib/actions/index.js b/lib/actions/index.js
@@ -23,7 +23,6 @@ exports.testRun = test_1.testRun;
 exports.testComplete = test_1.testComplete;
 exports.testResult = test_1.testResult;
 exports.testSave = test_1.testSave;
-exports.testsLoad = test_1.testsLoad;
 var tutorial_1 = require('./tutorial');
 exports.tutorialsFind = tutorial_1.tutorialsFind;
 exports.tutorialSet = tutorial_1.tutorialSet;
diff --git a/lib/actions/page.js b/lib/actions/page.js
@@ -1,6 +1,6 @@
 "use strict";
-var test_1 = require('./test');
 var _types_1 = require('./_types');
+var config_task_tests_1 = require('./config-task-tests');
 function pageNext() {
     return function (dispatch, getState) {
         var _a = getState(), pagePosition = _a.pagePosition, tutorial = _a.tutorial;
@@ -11,7 +11,6 @@ function pageNext() {
         else {
             pagePosition += 1;
             dispatch(pageSet(pagePosition));
-            dispatch(test_1.testsLoad(pagePosition));
         }
     };
 }
@@ -20,11 +19,12 @@ function pageSet(pagePosition) {
     if (pagePosition === void 0) { pagePosition = 0; }
     return function (dispatch, getState) {
         var _a = getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial;
+        var tasks = config_task_tests_1.default(dir, tutorial, tutorial.pages[pagePosition].tasks || []);
         if (pagePosition >= progress.pages.length) {
             dispatch({ type: _types_1.ROUTE_SET, payload: { route: 'final' } });
         }
         dispatch({
-            type: _types_1.PAGE_SET, payload: { dir: dir, pagePosition: pagePosition, tutorial: tutorial, progress: progress }
+            type: _types_1.PAGE_SET, payload: { dir: dir, pagePosition: pagePosition, tutorial: tutorial, progress: progress, tasks: tasks }
         });
     };
 }
diff --git a/lib/actions/test.js b/lib/actions/test.js
@@ -24,14 +24,3 @@ function testSave() {
     return { type: _types_1.TEST_SAVE };
 }
 exports.testSave = testSave;
-function testsLoad(pagePosition) {
-    return function (dispatch, getState) {
-        var _a = getState(), tasks = _a.tasks, progress = _a.progress, tutorial = _a.tutorial, dir = _a.dir;
-        dispatch({
-            type: _types_1.TESTS_LOAD, payload: {
-                pagePosition: pagePosition, tasks: tasks, progress: progress, tutorial: tutorial, dir: dir
-            }
-        });
-    };
-}
-exports.testsLoad = testsLoad;
diff --git a/lib/components/Progress/ProgressPage/index.js b/lib/components/Progress/ProgressPage/index.js
@@ -41,7 +41,6 @@ var ProgressPage = (function (_super) {
             return {
                 selectPage: function (pagePosition) {
                     dispatch(actions_1.pageSet(pagePosition));
-                    dispatch(actions_1.testsLoad(pagePosition));
                     dispatch(actions_1.routeSet('page'));
                 }
             };
diff --git a/lib/reducers/checks/action-setup.js b/lib/reducers/checks/action-setup.js
@@ -2,8 +2,6 @@
 var path_1 = require('path');
 var editor_1 = require('../../atom/editor');
 var editor_2 = require('../../atom/editor');
-var actions_1 = require('../../actions');
-var store_1 = require('../../store');
 var packageData = "{\n  \"name\": \"demo\",\n  \"dependencies\": {\n    \"coderoad-functional-school\": \"^0.2.2\"\n  }\n}";
 function createPackageJson(dir) {
     var packagePath = path_1.join(dir, 'package.json');
@@ -12,7 +10,6 @@ function createPackageJson(dir) {
         setTimeout(function () { return resolve(); });
     }).then(function () {
         editor_1.set(packageData);
-        store_1.default.dispatch(actions_1.setupVerify());
     });
 }
 exports.createPackageJson = createPackageJson;
diff --git a/lib/reducers/checks/action-system.js b/lib/reducers/checks/action-system.js
@@ -1,11 +1,8 @@
 "use strict";
 var command_line_1 = require('../../services/command-line');
-var store_1 = require('../../store');
-var actions_1 = require('../../actions');
 function updateNpm() {
     command_line_1.default('npm', 'update -g npm')
         .then(function (res) {
-        store_1.default.dispatch(actions_1.setupVerify());
     });
 }
 exports.updateNpm = updateNpm;
diff --git a/lib/reducers/index.js b/lib/reducers/index.js
@@ -19,8 +19,8 @@ var tutorial_1 = require('./tutorial');
 var tutorial_list_1 = require('./tutorial-list');
 var window_toggle_1 = require('./window-toggle');
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = redux_1.combineReducers({
-    alert: alert_1.default, checks: checks_1.default, dir: dir_1.default, devToolsToggle: devTools_toggle_1.default, taskActions: task_actions_1.default, hintPosition: hint_position_1.default, page: page_1.default,
-    packageJson: package_json_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.default, taskPosition: task_position_1.default,
+exports.default = redux_1.combineReducers(Object.assign({}, {
+    alert: alert_1.default, checks: checks_1.default, dir: dir_1.default, devToolsToggle: devTools_toggle_1.default, taskActions: task_actions_1.default, hintPosition: hint_position_1.default,
+    packageJson: package_json_1.default, page: page_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.default, taskPosition: task_position_1.default,
     taskTests: task_tests_1.default, tasks: tasks_1.default, testRun: test_run_1.default, tutorial: tutorial_1.default, tutorialList: tutorial_list_1.default, windowToggle: window_toggle_1.default
-});
+}));
diff --git a/lib/reducers/page/index.js b/lib/reducers/page/index.js
@@ -1,6 +1,5 @@
 "use strict";
 var _types_1 = require('../../actions/_types');
-var editor_1 = require('../../atom/editor');
 var _page = {
     title: '',
     description: '',
@@ -12,7 +11,6 @@ function pageReducer(p, action) {
         case _types_1.PAGE_SET:
             var _a = action.payload, pagePosition = _a.pagePosition, tutorial = _a.tutorial;
             var _b = tutorial.pages[pagePosition], title = _b.title, description = _b.description, onPageComplete = _b.onPageComplete, completed = _b.completed;
-            editor_1.clearConsole();
             return {
                 title: title,
                 description: description,
diff --git a/lib/reducers/task-actions/index.js b/lib/reducers/task-actions/index.js
@@ -14,7 +14,7 @@ function taskActionsReducer(taskActions, action) {
     if (taskActions === void 0) { taskActions = []; }
     var actions = null;
     switch (action.type) {
-        case _types_1.TESTS_LOAD:
+        case _types_1.PAGE_SET:
             var _a = action.payload, tasks = _a.tasks, pagePosition = _a.pagePosition, progress = _a.progress;
             var isCompleted = progress.pages[pagePosition];
             if (!isCompleted) {
diff --git a/lib/reducers/task-tests/config-task-tests.js b/lib/reducers/task-tests/config-task-tests.js
diff --git a/lib/reducers/task-tests/index.js b/lib/reducers/task-tests/index.js
@@ -4,7 +4,7 @@ var _types_1 = require('../../actions/_types');
 function taskTestsReducer(taskTests, action) {
     if (taskTests === void 0) { taskTests = ''; }
     switch (action.type) {
-        case _types_1.TESTS_LOAD:
+        case _types_1.PAGE_SET:
             var _a = action.payload, tutorial = _a.tutorial, tasks = _a.tasks;
             return [].concat.apply([], tasks.map(function (task) { return task.tests || []; })).reduce(function (output, file) {
                 try {
diff --git a/lib/reducers/tasks/index.js b/lib/reducers/tasks/index.js
@@ -1,6 +1,5 @@
 "use strict";
 var _types_1 = require('../../actions/_types');
-var config_task_tests_1 = require('./config-task-tests');
 var _tasks = [{
         actions: [],
         completed: false,
@@ -12,8 +11,7 @@ function tasksReducer(tasks, action) {
     if (tasks === void 0) { tasks = _tasks; }
     switch (action.type) {
         case _types_1.PAGE_SET:
-            var _a = action.payload, dir = _a.dir, tutorial = _a.tutorial, pagePosition = _a.pagePosition;
-            return config_task_tests_1.default(dir, tutorial, tutorial.pages[pagePosition].tasks || []);
+            return action.payload.tasks;
         default:
             return tasks;
     }
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "atom": ">=1.0.0 <2.0.0"
   },
   "dependencies": {
+    "coderoad-core": "^0.1.0",
     "highlights": "1.3.1",
     "marked": "0.3.5",
     "material-ui": "0.15.0",
diff --git a/src/actions/_types.ts b/src/actions/_types.ts
@@ -17,7 +17,6 @@ export const SETUP_VERIFY = 'SETUP_VERIFY';
 export const TEST_COMPLETE = 'TEST_COMPLETE';
 export const TEST_RESULT = 'TEST_RESULT';
 export const TEST_RUN = 'TEST_RUN';
-export const TESTS_LOAD = 'TESTS_LOAD';
 export const TUTORIAL_SET = 'TUTORIAL_SET';
 export const TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
 export const TUTORIALS_FIND = 'TUTORIALS_FIND';
diff --git a/src/actions/config-task-tests.ts b/src/actions/config-task-tests.ts
@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {isWindows} from '../../services/system';
+import {isWindows} from '../services/system';
 
 function configTestString(
   dir: string, tutorial: CR.Tutorial, config: Tutorial.Config,
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -7,7 +7,7 @@ export {pageSet, pageNext, pagePositionLoad, pagePositionSet} from './page';
 export {routeSet} from './route';
 export {setupVerify} from './setup';
 export {
-  testRun, testComplete, testResult, testSave, testsLoad
+  testRun, testComplete, testResult, testSave
 } from './test';
 export {
   tutorialsFind, tutorialSet, tutorialUpdate
diff --git a/src/actions/page.ts b/src/actions/page.ts
@@ -1,7 +1,7 @@
-import {testsLoad} from './test';
 import {
   ROUTE_SET, PAGE_SET, PAGE_POSITION_SET, PAGE_POSITION_LOAD
 } from './_types';
+import configTaskTests from './config-task-tests';
 
 export function pageNext(): ReduxThunk.ThunkInterface | Action {
   return (dispatch, getState): void => {
@@ -11,21 +11,23 @@ export function pageNext(): ReduxThunk.ThunkInterface | Action {
       dispatch({ type: ROUTE_SET, payload: { route: 'final' } });
     } else {
       pagePosition += 1;
-      // call TESTS_LOAD after PAGE_SET
       dispatch(pageSet(pagePosition));
-      dispatch(testsLoad(pagePosition));
     }
   };
 }
 
 export function pageSet(pagePosition = 0): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {dir, progress, tutorial} = getState();
+    // create absolute paths for 'task-tests'
+    const tasks = configTaskTests(
+      dir, tutorial, tutorial.pages[pagePosition].tasks || []
+    );
     if (pagePosition >= progress.pages.length) {
       dispatch({ type: ROUTE_SET, payload: { route: 'final' } });
     }
     dispatch({
-      type: PAGE_SET, payload: { dir, pagePosition, tutorial, progress }
+      type: PAGE_SET, payload: { dir, pagePosition, tutorial, progress, tasks }
     });
   };
 }
diff --git a/src/actions/test.ts b/src/actions/test.ts
@@ -1,5 +1,5 @@
 import {
-  TEST_RUN, TEST_RESULT, TEST_COMPLETE, TESTS_LOAD, TEST_SAVE
+  TEST_RUN, TEST_RESULT, TEST_COMPLETE, TEST_SAVE
 } from './_types';
 
 export function testRun(): ReduxThunk.ThunkInterface {
@@ -25,16 +25,3 @@ export function testComplete(): Action {
 export function testSave(): Action {
   return { type: TEST_SAVE };
 }
-
-export function testsLoad(
-  pagePosition: CR.PagePosition
-): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
-    const {tasks, progress, tutorial, dir} = getState();
-    dispatch({
-      type: TESTS_LOAD, payload: {
-        pagePosition, tasks, progress, tutorial, dir
-      }
-    });
-  };
-}
diff --git a/src/components/Progress/ProgressPage/index.tsx b/src/components/Progress/ProgressPage/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {pageSet, routeSet, testsLoad} from '../../../actions';
+import {pageSet, routeSet} from '../../../actions';
 import {ListItem} from 'material-ui/List';
 import progressIcon from '../progressIcon';
 import {grey400} from 'material-ui/styles/colors';
@@ -14,7 +14,6 @@ const styles = {
   return {
     selectPage: (pagePosition: CR.PagePosition) => {
       dispatch(pageSet(pagePosition));
-      dispatch(testsLoad(pagePosition));
       dispatch(routeSet('page'));
     }
   };
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
@@ -1,4 +1,5 @@
 import {combineReducers} from 'redux';
+// import {reducers} from 'coderoad-core';
 
 import alert from './alert';
 import checks from './checks';
@@ -19,8 +20,10 @@ import tutorial from './tutorial';
 import tutorialList from './tutorial-list';
 import windowToggle from './window-toggle';
 
-export default combineReducers({
-  alert, checks, dir, devToolsToggle, taskActions, hintPosition, page,
-  packageJson, pagePosition, progress, route, taskPosition,
-  taskTests, tasks, testRun, tutorial, tutorialList, windowToggle
-});
+export default combineReducers(
+  Object.assign({}, {
+    alert, checks, dir, devToolsToggle, taskActions, hintPosition,
+    packageJson, page, pagePosition, progress, route, taskPosition,
+    taskTests, tasks, testRun, tutorial, tutorialList, windowToggle
+  })
+);
diff --git a/src/reducers/page/index.ts b/src/reducers/page/index.ts
@@ -1,5 +1,5 @@
 import {PAGE_SET, COMPLETE_PAGE} from '../../actions/_types';
-import {clearConsole} from '../../atom/editor';
+// import {clearConsole} from '../../atom/editor';
 
 const _page: CR.Page = {
   title: '',
@@ -16,7 +16,7 @@ export default function pageReducer(
       const {pagePosition, tutorial} = action.payload;
       const {title, description, onPageComplete, completed} = tutorial.pages[pagePosition];
       // clear dev console
-      clearConsole();
+      // clearConsole();
       return {
         title,
         description,
diff --git a/src/reducers/task-actions/index.ts b/src/reducers/task-actions/index.ts
@@ -1,4 +1,4 @@
-import {TESTS_LOAD, TEST_RESULT} from '../../actions/_types';
+import {PAGE_SET, TEST_RESULT} from '../../actions/_types';
 import editorActionReducer from './editor-reducer';
 
 function handleTaskActions(actions: string[][]): void {
@@ -20,7 +20,7 @@ export default function taskActionsReducer(
   let actions: string[][] = null;
   switch (action.type) {
 
-    case TESTS_LOAD:
+    case PAGE_SET:
       const {tasks, pagePosition, progress} = action.payload;
       const isCompleted = progress.pages[pagePosition];
       if (!isCompleted) {
diff --git a/src/reducers/task-tests/index.ts b/src/reducers/task-tests/index.ts
@@ -1,12 +1,12 @@
 import {readFileSync} from 'fs';
-import {TESTS_LOAD} from '../../actions/_types';
+import {PAGE_SET} from '../../actions/_types';
 
 export default function taskTestsReducer(
   taskTests = '', action: Action
 ): string {
   switch (action.type) {
 
-    case TESTS_LOAD:
+    case PAGE_SET:
       const {tutorial, tasks} = action.payload;
       return [].concat.apply([], tasks.map(
         task => task.tests || [])
diff --git a/src/reducers/tasks/index.ts b/src/reducers/tasks/index.ts
@@ -14,11 +14,7 @@ export default function tasksReducer(tasks = _tasks,
   switch (action.type) {
 
     case PAGE_SET:
-      const {dir, tutorial, pagePosition} = action.payload;
-      // create absolute paths for 'task-tests'
-      return configTaskTests(
-        dir, tutorial, tutorial.pages[pagePosition].tasks || []
-      );
+      return action.payload.tasks;
 
     default:
       return tasks;
diff --git a/src/reducers/test-run/index.ts b/src/reducers/test-run/index.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ var ProgressPage = (function (_super) {`
`41`	`41`	`return {`
`42`	`42`	`selectPage: function (pagePosition) {`
`43`	`43`	`dispatch(actions_1.pageSet(pagePosition));`
`44`		`- dispatch(actions_1.testsLoad(pagePosition));`
`45`	`44`	`dispatch(actions_1.routeSet('page'));`
`46`	`45`	`}`
`47`	`46`	`};`