test running progress

Author: ShMcK

src/editor/commands/index.ts

@@ -73,7 +73,7 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
             console.log('save document', document)
             if (languageIds.includes(document.languageId) && document.uri.scheme === 'file') {
                 // do work
-                vscode.commands.executeCommand('coderoad.run_test')
+                machine.send('TEST_RUN')
             }
         })
     },
@@ -104,6 +104,9 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
         machine.send(action)
     },
     [COMMANDS.RUN_TEST]: () => {
-        runTest()
+        runTest({
+            onSuccess: () => machine.send('TEST_PASS'),
+            onFail: () => machine.send('TEST_FAIL')
+        })
     }
 })

src/editor/commands/runTest.ts

@@ -1,7 +1,6 @@
 import * as vscode from 'vscode'
 import { exec } from '../../services/node'
 import * as storage from '../../services/storage'
-import * as testResult from '../../services/testResult'
 
 // ensure only latest run_test action is taken
 let currentId = 0
@@ -21,7 +20,12 @@ const getOutputChannel = (name: string): vscode.OutputChannel => {
   return _channel
 }
 
-export default async function runTest(): Promise<void> {
+interface Props {
+  onSuccess(): void,
+  onFail(): void
+}
+
+export default async function runTest({ onSuccess, onFail }: Props): Promise<void> {
   // increment process id
   let processId = ++currentId
 
@@ -73,8 +77,8 @@ export default async function runTest(): Promise<void> {
               // exit early
               return
             }
-            // @ts-ignore
-            testResult.onSuccess(position)
+            console.log('call onSuccess')
+            onSuccess()
           } else {
             console.log('NOT SUCCESS?')
           }
@@ -118,7 +122,8 @@ export default async function runTest(): Promise<void> {
               return
             }
             console.log('ERROR', firstError.message)
-            testResult.onFailure()
+            console.log('call onFail')
+            onFail()
           } else {
             console.error('NOTE: PARSER DID NOT WORK FOR ', line)
           }

src/services/testResult.ts

@@ -1,53 +1,53 @@
-import * as CR from 'typings'
-import * as vscode from 'vscode'
-import * as storage from './storage'
-
-export async function onSuccess(position: CR.Position) {
-  console.log('onSuccess', position)
-  vscode.window.showInformationMessage('SUCCESS')
-
-  // calculate progress changes
-  const [progress, tutorial] = await Promise.all([storage.getProgress(), storage.getTutorial()])
-
-  if (!tutorial) {
-    throw new Error('No tutorial found')
-  }
-
-  if (!position.stepId) {
-    throw new Error('No step position found')
-  }
-
-  const { data } = tutorial
-
-  // step complete
-  const nextProgress = progress
-  nextProgress.steps[position.stepId] = true
-
-  // is stage complete
-  const steps = data.stages[position.stageId].stepList
-  const isStageComplete = progress.stages[position.stageId] || steps[steps.length - 1] === position.stepId
-  nextProgress.stages[position.stageId] = isStageComplete
-
-  // is level complete
-  if (isStageComplete) {
-    const stages = data.levels[position.levelId].stageList
-    const isLevelComplete = progress.levels[position.levelId] || stages[stages.length - 1] === position.stageId
-    nextProgress.levels[position.levelId] = isLevelComplete
-
-    if (isLevelComplete) {
-      const levels = data.summary.levelList
-      const isTutorialComplete = progress.complete || levels[levels.length - 1] === position.levelId
-      nextProgress.complete = isTutorialComplete
-    }
-  }
-  console.log('nextProgress', nextProgress)
-
-  // update ls progress
-  storage.updateProgress(nextProgress)
-  // send({ type: 'STEP_COMPLETE', payload: { progress: nextProgress } })
-}
-
-export async function onFailure() {
-  // TODO: capture analytics on stepId
-  vscode.window.showWarningMessage('FAIL')
-}
+// import * as CR from 'typings'
+// import * as vscode from 'vscode'
+// import * as storage from './storage'
+
+// export async function onSuccess(position: CR.Position) {
+//   console.log('onSuccess', position)
+//   vscode.window.showInformationMessage('SUCCESS')
+
+//   // calculate progress changes
+//   const [progress, tutorial] = await Promise.all([storage.getProgress(), storage.getTutorial()])
+
+//   if (!tutorial) {
+//     throw new Error('No tutorial found')
+//   }
+
+//   if (!position.stepId) {
+//     throw new Error('No step position found')
+//   }
+
+//   const { data } = tutorial
+
+//   // step complete
+//   const nextProgress = progress
+//   nextProgress.steps[position.stepId] = true
+
+//   // is stage complete
+//   const steps = data.stages[position.stageId].stepList
+//   const isStageComplete = progress.stages[position.stageId] || steps[steps.length - 1] === position.stepId
+//   nextProgress.stages[position.stageId] = isStageComplete
+
+//   // is level complete
+//   if (isStageComplete) {
+//     const stages = data.levels[position.levelId].stageList
+//     const isLevelComplete = progress.levels[position.levelId] || stages[stages.length - 1] === position.stageId
+//     nextProgress.levels[position.levelId] = isLevelComplete
+
+//     if (isLevelComplete) {
+//       const levels = data.summary.levelList
+//       const isTutorialComplete = progress.complete || levels[levels.length - 1] === position.levelId
+//       nextProgress.complete = isTutorialComplete
+//     }
+//   }
+//   console.log('nextProgress', nextProgress)
+
+//   // update ls progress
+//   storage.updateProgress(nextProgress)
+//   // send({ type: 'STEP_COMPLETE', payload: { progress: nextProgress } })
+// }
+
+// export async function onFailure() {
+//   // TODO: capture analytics on stepId
+//   vscode.window.showWarningMessage('FAIL')
+// }

src/state/actions/index.ts

@@ -84,5 +84,8 @@ export default {
     }),
     tutorialLoadNext() {
         machine.send('LOAD_NEXT')
+    },
+    testStart() {
+        vscode.commands.executeCommand('coderoad.run_test')
     }
 }

src/state/machine.ts

@@ -21,7 +21,7 @@ export const machine = Machine<
                 states: {
                     Initial: {
                         after: {
-                            1000: 'Startup'
+                            2000: 'Startup'
                         }
                     },
                     Startup: {
@@ -101,8 +101,9 @@ export const machine = Machine<
                                 },
                             },
                             TestRunning: {
+                                onEntry: ['testStart'],
                                 on: {
-                                    TEST_SUCCESS: [
+                                    TEST_PASS: [
                                         {
                                             target: 'StageComplete',
                                             cond: 'tasksComplete',
@@ -111,7 +112,7 @@ export const machine = Machine<
                                             target: 'TestPass',
                                         },
                                     ],
-                                    TEST_FAILURE: 'TestFail',
+                                    TEST_FAIL: 'TestFail',
                                 },
                             },
                             TestPass: {
@@ -129,8 +130,8 @@ export const machine = Machine<
                                 },
                             },
                             TestFail: {
-                                on: {
-                                    RETURN: 'StageNormal',
+                                after: {
+                                    0: 'StageNormal'
                                 },
                             },
                             StageComplete: {