restructuring test running for load and run - nearly complete

ShMcK · ShMcK · commit f63b205f2df2 · 2016-08-07T20:24:05.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -12,6 +12,7 @@ var actions_4 = require('./modules/progress/actions');
 exports.progressLoad = actions_4.progressLoad;
 exports.progressCompletePage = actions_4.progressCompletePage;
 var actions_5 = require('./modules/tests/actions');
+exports.testLoad = actions_5.testLoad;
 exports.testRun = actions_5.testRun;
 exports.testResult = actions_5.testResult;
 exports.testComplete = actions_5.testComplete;
diff --git a/lib/components/Routes/index.js b/lib/components/Routes/index.js
diff --git a/lib/modules/page/actions.js b/lib/modules/page/actions.js
@@ -21,6 +21,7 @@ function pageSet(pagePosition) {
         dispatch({
             type: types_1.PAGE_SET, payload: { pagePosition: pagePosition, tutorial: tutorial, progress: progress, tasks: tasks }
         });
+        dispatch(actions_1.testLoad());
     };
 }
 exports.pageSet = pageSet;
diff --git a/lib/modules/tests/actions.js b/lib/modules/tests/actions.js
@@ -1,35 +1,37 @@
 "use strict";
 var actions_1 = require('../../actions');
+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 testFile = testName_1.default({ tutorial: tutorial, pagePosition: pagePosition });
+        dispatch({
+            type: types_1.TEST_LOAD, payload: {
+                dir: dir,
+                tests: taskTests,
+                load: tutorial.config.load,
+                testFile: testFile,
+            }
+        });
+    };
+}
+exports.testLoad = testLoad;
 function testRun() {
     return function (dispatch, getState) {
         var timeSinceLastTestRun = performance.now() - getState().testRun.time;
         if (timeSinceLastTestRun < 1000) {
             return;
         }
-        var _a = getState(), taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition;
+        var _a = getState(), taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition, pagePosition = _a.pagePosition;
+        var testFile = testName_1.default({ tutorial: tutorial, pagePosition: pagePosition });
         dispatch({
-            type: types_1.TEST_RUN, payload: { taskTests: taskTests, dir: dir, tutorial: tutorial, taskPosition: taskPosition }
+            type: types_1.TEST_RUN,
+            payload: { taskTests: taskTests, dir: dir, tutorial: tutorial, taskPosition: taskPosition, testFile: testFile }
         });
     };
 }
 exports.testRun = testRun;
-function testLoad() {
-    return function (dispatch, getState) {
-        var _a = getState(), dir = _a.dir, pagePosition = _a.pagePosition, tutorial = _a.tutorial;
-        dispatch({
-            type: types_1.TEST_LOAD, payload: {
-                dir: dir,
-                pagePosition: pagePosition,
-                tutorial: {
-                    name: tutorial.name,
-                    version: tutorial.version
-                }
-            }
-        });
-    };
-}
-exports.testLoad = testLoad;
 function testResult(result) {
     return function (dispatch, getState) {
         var _a = getState(), taskActions = _a.taskActions, progress = _a.progress, pagePosition = _a.pagePosition;
diff --git a/lib/modules/tests/test-run/index.js b/lib/modules/tests/test-run/index.js
@@ -11,23 +11,22 @@ var defaultTestRun = {
 function runTest(testRun, action) {
     if (testRun === void 0) { testRun = defaultTestRun; }
     switch (action.type) {
+        case types_1.TEST_LOAD:
+            load_1.default(action.payload);
+            return {
+                running: false,
+                time: performance.now() + pageSetTimeout,
+            };
         case types_1.TEST_RUN:
-            var _a = action.payload, taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition;
             return {
                 running: true,
-                time: run_1.default(taskTests, dir, tutorial, taskPosition),
+                time: run_1.default(action.payload),
             };
         case types_1.TEST_COMPLETE:
             return {
                 running: false,
                 time: performance.now() + testCompleteTimeout,
             };
-        case 'PAGE_SET':
-            load_1.default();
-            return {
-                running: false,
-                time: performance.now() + pageSetTimeout,
-            };
         default:
             return testRun;
     }
diff --git a/lib/modules/tests/test-run/load.js b/lib/modules/tests/test-run/load.js
@@ -1,6 +1,7 @@
 "use strict";
-function loadTaskTests() {
-    console.log('load');
+function loadTaskTests(_a) {
+    var dir = _a.dir, tutorial = _a.tutorial, tests = _a.tests, pagePosition = _a.pagePosition, load = _a.load;
+    load({ dir: dir, tutorial: tutorial, tests: tests, pagePosition: pagePosition });
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loadTaskTests;
diff --git a/lib/modules/tests/test-run/run.js b/lib/modules/tests/test-run/run.js
@@ -1,17 +1,9 @@
 "use strict";
 var handle_result_1 = require('./handle-result');
-var parse_loaders_1 = require('./parse-loaders');
-function runTaskTests(taskTests, dir, tutorial, taskPosition) {
-    var tests = taskTests;
-    if (tests && tests.length) {
-        var tutorialConfig = tutorial.config;
-        var testString = parse_loaders_1.default(tests, tutorialConfig.testSuffix, tutorial, dir);
-        var config = {
-            dir: dir,
-            tutorialDir: tutorialConfig.dir,
-            taskPosition: taskPosition
-        };
-        tutorialConfig.run({ testString: testString, config: config, handleResult: handle_result_1.default });
+function runTaskTests(_a) {
+    var taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition, testFile = _a.testFile;
+    if (taskTests && taskTests.length) {
+        tutorial.config.run({ dir: dir, taskPosition: taskPosition, handleResult: handle_result_1.default, testFile: testFile });
     }
     return performance.now();
 }
diff --git a/lib/modules/tests/test-run/testName.js b/lib/modules/tests/test-run/testName.js
@@ -0,0 +1,10 @@
+"use strict";
+function getTestName(_a) {
+    var tutorial = _a.tutorial, pagePosition = _a.pagePosition;
+    if (!tutorial || !tutorial.name || !tutorial.version || typeof pagePosition !== 'number') {
+        console.log('Error creating temporary test name');
+    }
+    return tutorial.name + "__" + tutorial.version + "__" + pagePosition;
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getTestName;
diff --git a/lib/modules/tutorial/utils/config-runner.js b/lib/modules/tutorial/utils/config-runner.js
@@ -24,12 +24,10 @@ function configRunner(name, runner, dir) {
     runnerMain = path_1.join.apply(null, runnerMain.split(slash));
     runnerRoot = runnerRoot.substring(0, runnerRoot.lastIndexOf(slash));
     var pathToMain = path_1.join(runnerRoot, runnerMain);
-    if (!!require(pathToMain).default) {
-        return require(pathToMain).default;
-    }
-    else {
-        return require(pathToMain);
-    }
+    return {
+        load: require(pathToMain).load,
+        run: require(pathToMain).run,
+    };
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = configRunner;
diff --git a/lib/modules/tutorial/utils/config.js b/lib/modules/tutorial/utils/config.js
@@ -9,11 +9,13 @@ function tutorialConfig(tutorialPj, dir) {
     var runner = config.runner;
     var runnerOptions = config.runnerOptions || {};
     var configEdit = tutorialPj.config.edit;
+    var getRunner = config_runner_1.default(name, config.runner, dir);
     return {
         dir: tutorialDir,
         runner: runner,
         runnerOptions: runnerOptions,
-        run: config_runner_1.default(name, config.runner, dir),
+        run: getRunner.run,
+        load: getRunner.load,
         testSuffix: configTestSuffix(config.testSuffix),
         issuesPath: config_repo_1.configIssuesPath(tutorialPj.bugs),
         repo: repo,
diff --git a/src/actions.ts b/src/actions.ts
@@ -2,7 +2,7 @@ export {alertOpen, alertClose, alertReplay} from './modules/alert/actions';
 export {hintPositionSet} from './modules/hints/actions';
 export {pageSet, pageNext} from './modules/page/actions';
 export {progressLoad, progressCompletePage} from './modules/progress/actions';
-export {testRun, testResult, testComplete} from './modules/tests/actions';
+export {testLoad, testRun, testResult, testComplete} from './modules/tests/actions';
 export {setupVerify, setupPackage} from './modules/setup/actions';
 export {tutorialSet} from './modules/tutorial';
 export {tutorialsFind, tutorialUpdate} from './modules/tutorials';
diff --git a/src/modules/page/actions.ts b/src/modules/page/actions.ts
@@ -1,4 +1,4 @@
-import {hintPositionSet, routeSet} from '../../actions';
+import {hintPositionSet, routeSet, testLoad} from '../../actions';
 import {PAGE_SET} from './types';
 
 export function pageNext(): ReduxThunk.ThunkInterface | Action {
@@ -24,5 +24,6 @@ export function pageSet(pagePosition = 0): ReduxThunk.ThunkInterface {
     dispatch({
       type: PAGE_SET, payload: { pagePosition, tutorial, progress, tasks }
     });
+    dispatch(testLoad());
   };
 }
diff --git a/src/modules/tests/actions.ts b/src/modules/tests/actions.ts
@@ -1,32 +1,36 @@
 import {alertOpen, hintPositionSet, progressCompletePage} from '../../actions';
+import getTestName from './test-run/testName';
 import {TEST_COMPLETE, TEST_LOAD, TEST_RESULT, TEST_RUN} from './types';
 
+export function testLoad() {
+  return (dispatch, getState): void => {
+    const { dir, pagePosition, tutorial, taskTests } = getState();
+    const testFile = getTestName({tutorial, pagePosition});
+
+    dispatch({
+      type: TEST_LOAD, payload: {
+        dir,
+        tests: taskTests,
+        load: tutorial.config.load,
+        testFile,
+      }
+    });
+  };
+}
+
 export function testRun(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     // less than a second since the last test run, skip
     const timeSinceLastTestRun = performance.now() - getState().testRun.time;
     if (timeSinceLastTestRun < 1000) {
       return;
     }
-    const {taskTests, dir, tutorial, taskPosition} = getState();
-    dispatch({
-      type: TEST_RUN, payload: { taskTests, dir, tutorial, taskPosition }
-    });
-  };
-}
+    const {taskTests, dir, tutorial, taskPosition, pagePosition} = getState();
+    const testFile = getTestName({tutorial, pagePosition});
 
-export function testLoad() {
-  return (dispatch, getState): void => {
-    const { dir, pagePosition, tutorial } = getState();
     dispatch({
-      type: TEST_LOAD, payload: {
-        dir,
-        pagePosition,
-        tutorial: {
-          name: tutorial.name,
-          version: tutorial.version
-        }
-      }
+      type: TEST_RUN,
+      payload: { taskTests, dir, tutorial, taskPosition, testFile }
     });
   };
 }
diff --git a/src/modules/tests/test-run/index.ts b/src/modules/tests/test-run/index.ts
@@ -1,4 +1,4 @@
-import {TEST_COMPLETE, TEST_RUN} from '../types';
+import {TEST_COMPLETE, TEST_LOAD, TEST_RUN} from '../types';
 import loadTaskTests from './load';
 import runTaskTests from './run';
 
@@ -21,12 +21,19 @@ export default function runTest(
 ): IRunTest {
   switch (action.type) {
 
+    case TEST_LOAD:
+      loadTaskTests(action.payload);
+      // add extra time, as page loading takes longer
+      return {
+        running: false,
+        time: performance.now() + pageSetTimeout,
+      };
+
     case TEST_RUN:
-      const {taskTests, dir, tutorial, taskPosition} = action.payload;
       // call test runner
       return {
         running: true,
-        time: runTaskTests(taskTests, dir, tutorial, taskPosition),
+        time: runTaskTests(action.payload),
       };
 
     case TEST_COMPLETE:
@@ -35,14 +42,6 @@ export default function runTest(
         time: performance.now() + testCompleteTimeout,
       };
 
-    case 'PAGE_SET':
-      loadTaskTests();
-      // add extra time, as page loading takes longer
-      return {
-        running: false,
-        time: performance.now() + pageSetTimeout,
-      };
-
     default:
       return testRun;
   }
diff --git a/src/modules/tests/test-run/load.ts b/src/modules/tests/test-run/load.ts
@@ -1,4 +1,3 @@
-export default function loadTaskTests() {
-  console.log('load')
-  // tutorialConfig.run({});
+export default function loadTaskTests({dir, tutorial, tests, pagePosition, load}) {
+  load({dir, tutorial, tests, pagePosition});
 }
diff --git a/src/modules/tests/test-run/run.ts b/src/modules/tests/test-run/run.ts
@@ -3,25 +3,24 @@ import {join} from 'path';
 import handleResult from './handle-result';
 import parseLoaders from './parse-loaders';
 
-export default function runTaskTests(
-  taskTests: string, dir: string, tutorial: CR.Tutorial, taskPosition: number
-): number {
-  const tests: string = taskTests;
+export default function runTaskTests({
+  taskTests, dir, tutorial, taskPosition, testFile
+}): number {
 
-  if (tests && tests.length) {
-    const tutorialConfig: Tutorial.Config = tutorial.config;
-    const testString = parseLoaders(
-      tests, tutorialConfig.testSuffix, tutorial, dir
-    );
-
-    const config: Test.Config = {
-      dir,
-      tutorialDir: tutorialConfig.dir,
-      taskPosition
-    };
+  if (taskTests && taskTests.length) {
+    // const tutorialConfig: Tutorial.Config = tutorial.config;
+    // const testString = parseLoaders(
+    //   tests, tutorialConfig.testSuffix, tutorial, dir
+    // );
+    //
+    // const config: Test.Config = {
+    //   dir,
+    //   tutorialDir: tutorialConfig.dir,
+    //   taskPosition
+    // };
 
     // call test runner
-    tutorialConfig.run({testString, config, handleResult});
+    tutorial.config.run({dir, taskPosition, handleResult, testFile});
   }
   // return finishing time of test
   // used to throttle test runs
diff --git a/src/modules/tests/test-run/testName.ts b/src/modules/tests/test-run/testName.ts
diff --git a/src/modules/tutorial/utils/config-runner.ts b/src/modules/tutorial/utils/config-runner.ts
diff --git a/src/modules/tutorial/utils/config.ts b/src/modules/tutorial/utils/config.ts

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ function pageSet(pagePosition) {`
`21`	`21`	`dispatch({`
`22`	`22`	`type: types_1.PAGE_SET, payload: { pagePosition: pagePosition, tutorial: tutorial, progress: progress, tasks: tasks }`
`23`	`23`	`});`
	`24`	`+ dispatch(actions_1.testLoad());`
`24`	`25`	`};`
`25`	`26`	`}`
`26`	`27`	`exports.pageSet = pageSet;`