Sep 9, 2019 · Sep 9, 2019 · Sep 9, 2019
diff --git a/src/Channel.ts b/src/Channel.ts
 console.log('RECEIVED:',actionType)
 switch(actionType){
 case'TEST_RUN':
 vscode.commands.executeCommand('coderoad.run_test')

 vscode.commands.executeCommand('coderoad.run_test',action.payload)
 return
 case'TUTORIAL_CONFIG':
 tutorialConfig(action.payload)
diff --git a/src/actions/runTest.ts b/src/actions/runTest.ts
 onSuccess():void
 onFail():void
 onRun():void
 onError():void
 }

 asyncfunctionrunTest({onSuccess, onFail, onRun}:Props):Promise<void>{
 asyncfunctionrunTest({onSuccess, onFail, onRun, onError}:Props):Promise<void>{
 // increment process id
 constprocessId=++currentId


 if(!stdout){
 console.error('SOMETHING WENT WRONG WITH A PASSING TEST')
 onError()
 }
 // test runner failed
 channel=getOutputChannel(outputChannelName)
diff --git a/src/editor/commands.ts b/src/editor/commands.ts

 webview.createOrShow(column)
 },
 [COMMANDS.RUN_TEST]:()=>{
 [COMMANDS.RUN_TEST]:({stepId}:{stepId:string})=>{
 console.log('run test webview',Object.keys(webview))
 runTest({
 onSuccess:()=>{
 console.log('COMMAND TEST_PASS')
 webview.send({type:'TEST_PASS'})
 webview.send({type:'TEST_PASS',payload:{stepId}})
 vscode.window.showInformationMessage('PASS')
 },
 onFail:()=>{
 console.log('COMMAND TEST_FAIL')
 webview.send({type:'TEST_FAIL'})
 webview.send({type:'TEST_FAIL',payload:{stepId}})
 vscode.window.showWarningMessage('FAIL')
 },
 onError:()=>{
 console.log('COMMAND TEST_ERROR')
 webview.send({type:'TEST_ERROR',payload:[stepId]})
 },
 onRun:()=>{
 console.log('COMMAND TEST_RUN')
 webview.send({type:'TEST_RUN'})
 webview.send({type:'TEST_RUN',payload:{stepId}})
 }
 })
 },
diff --git a/web-app/src/services/channel/index.ts b/web-app/src/services/channel/index.ts
 this.machineSend = send
 }
 public receive = (event: ReceivedEvent) => {
 console.log('CLIENT RECEIVE')
 const action = event.data

 // @ts-ignore // ignore browser events from plugins
 case 'TEST_PASS':
 // { type: 'TEST_PASS', payload: { stepId: string }}
 this.machineSend(action)
 console.log('test passed')
 return
 case 'TEST_FAIL':
 this.machineSend(action)
 return
 case 'TEST_RUN':
 console.log('TEST_RUN')
 this.machineSend(action)
 return
 case 'TEST_ERROR':
 console.log('TEST_ERROR')
 this.machineSend(action)
 return
 case 'ACTIONS_LOADED':
 console.log('ACTIONS_LOADED')
 // TODO: use this for verifying completion of stepActions
 return
 default:
 if (action.type) {
diff --git a/web-app/src/services/state/actions/context.ts b/web-app/src/services/state/actions/context.ts
 //@ts-ignore
 updateStepProgress:assign({
 progress:(context:CR.MachineContext,event:CR.MachineEvent):CR.Progress=>{

 // update progress by tracking completed
 constcurrentProgress:CR.Progress=context.progress

 // TODO: should use event id, to verify not multiple successes jumping one
 // const stepId = event.payload.stepId
 const{stepId}=context.position
 const{stepId}=event.payload

 currentProgress.steps[stepId]=true

diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts
 actions:['updateStepProgress']
 },
 TEST_FAIL:'TestFail',
 TEST_ERROR:'Normal'
 },
 },
 TestPass:{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,8 @@ class Channel implements Channel {
		console.log('RECEIVED:',actionType)
		switch(actionType){
		case'TEST_RUN':
		vscode.commands.executeCommand('coderoad.run_test')

		vscode.commands.executeCommand('coderoad.run_test',action.payload)
		return
		case'TUTORIAL_CONFIG':
		tutorialConfig(action.payload)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,9 +23,10 @@ interface Props {
		onSuccess():void
		onFail():void
		onRun():void
		onError():void
		}

		asyncfunctionrunTest({onSuccess, onFail, onRun}:Props):Promise<void>{
		asyncfunctionrunTest({onSuccess, onFail, onRun, onError}:Props):Promise<void>{
		// increment process id
		constprocessId=++currentId

Expand DownExpand Up		@@ -99,6 +100,7 @@ async function runTest({onSuccess, onFail, onRun}: Props): Promise<void> {

		if(!stdout){
		console.error('SOMETHING WENT WRONG WITH A PASSING TEST')
		onError()
		}
		// test runner failed
		channel=getOutputChannel(outputChannelName)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,22 +52,26 @@ export const createCommands = ({vscodeExt}: CreateCommandProps) => {

		webview.createOrShow(column)
		},
		[COMMANDS.RUN_TEST]:()=>{
		[COMMANDS.RUN_TEST]:({stepId}:{stepId:string})=>{
		console.log('run test webview',Object.keys(webview))
		runTest({
		onSuccess:()=>{
		console.log('COMMAND TEST_PASS')
		webview.send({type:'TEST_PASS'})
		webview.send({type:'TEST_PASS',payload:{stepId}})
		vscode.window.showInformationMessage('PASS')
		},
		onFail:()=>{
		console.log('COMMAND TEST_FAIL')
		webview.send({type:'TEST_FAIL'})
		webview.send({type:'TEST_FAIL',payload:{stepId}})
		vscode.window.showWarningMessage('FAIL')
		},
		onError:()=>{
		console.log('COMMAND TEST_ERROR')
		webview.send({type:'TEST_ERROR',payload:[stepId]})
		},
		onRun:()=>{
		console.log('COMMAND TEST_RUN')
		webview.send({type:'TEST_RUN'})
		webview.send({type:'TEST_RUN',payload:{stepId}})
		}
		})
		},
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,6 @@ class Channel {
		this.machineSend = send
		}
		public receive = (event: ReceivedEvent) => {
		console.log('CLIENT RECEIVE')
		const action = event.data

		// @ts-ignore // ignore browser events from plugins
Expand All		@@ -41,16 +40,20 @@ class Channel {
		case 'TEST_PASS':
		// { type: 'TEST_PASS', payload: { stepId: string }}
		this.machineSend(action)
		console.log('test passed')
		return
		case 'TEST_FAIL':
		this.machineSend(action)
		return
		case 'TEST_RUN':
		console.log('TEST_RUN')
		this.machineSend(action)
		return
		case 'TEST_ERROR':
		console.log('TEST_ERROR')
		this.machineSend(action)
		return
		case 'ACTIONS_LOADED':
		console.log('ACTIONS_LOADED')
		// TODO: use this for verifying completion of stepActions
		return
		default:
		if (action.type) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -104,13 +104,10 @@ export default {
		//@ts-ignore
		updateStepProgress:assign({
		progress:(context:CR.MachineContext,event:CR.MachineEvent):CR.Progress=>{

		// update progress by tracking completed
		constcurrentProgress:CR.Progress=context.progress

		// TODO: should use event id, to verify not multiple successes jumping one
		// const stepId = event.payload.stepId
		const{stepId}=context.position
		const{stepId}=event.payload

		currentProgress.steps[stepId]=true

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -124,6 +124,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
		actions:['updateStepProgress']
		},
		TEST_FAIL:'TestFail',
		TEST_ERROR:'Normal'
		},
		},
		TestPass:{
Expand Down