createTestRunner in progress

src/actions/runTest.ts → src/actions/runTest/index.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import node from '../services/node'
+import node from '../../services/node'
 
 // TODO: use tap parser to make it easier to support other test runners
 
@@ -21,31 +21,49 @@ const getOutputChannel = (name: string): vscode.OutputChannel => {
 	return channel
 }
 
-interface Props {
+interface Callbacks {
 	onSuccess(): void
 	onFail(): void
 	onRun(): void
 	onError(): void
 }
 
-async function runTest({onSuccess, onFail, onRun, onError}: Props): Promise<void> {
-	console.log('------------------- run test ------------------')
-	// increment process id
-	const processId = ++currentId
+interface TestRunnerConfig {
+	command: string
+	parser(output: string): boolean
+}
+
+export const createTestRunner = (config: TestRunnerConfig, callbacks: Callbacks) => {
+
+	const outputChannelName = 'TEST_OUTPUT'
+
+	return {
+		run() {
+			console.log('------------------- run test ------------------')
+			const processId = ++currentId
+			callbacks.onRun()
+
+			try {
+				const {stdout} = await node.exec(config.command)
+			}
+		}
+	}
+}
+
+async function runTest({onSuccess, onFail, onRun, onError}: Callbacks): Promise<void> {
+
 
-	onRun()
 
-	const outputChannelName = 'Test Output'
 
 	// TODO: verify test runner for args
 	// jest CLI docs https://jestjs.io/docs/en/cli
-	const testArgs = [
-		'--json',
-		'--onlyChanged',
-		'--env=node',
-		'--maxConcurrency=4',
-		'--maxWorkers=4'
-	]
+	// const testArgs = [
+	// 	'--json',
+	// 	'--onlyChanged',
+	// 	'--env=node',
+	// 	'--maxConcurrency=4',
+	// 	'--maxWorkers=4'
+	// ]
 
 	const commandLine = `npm test -- ${testArgs.join(' ')}`
 
@@ -61,23 +79,22 @@ async function runTest({onSuccess, onFail, onRun, onError}: Props): Promise<void
 		if (stdout) {
 			const lines = stdout.split(/\r{0,1}\n/)
 			for (const line of lines) {
-				if (line.length === 0) {
-					continue
-				}
-
-				const regExp = /^{\"numFailedTestSuites/
-				const matches = regExp.exec(line)
-				if (matches && matches.length) {
-					const result = JSON.parse(line)
-
-					if (result.success) {
-						if (shouldExitEarly(processId)) {
-							// exit early
-							return
+				if (line.length > 0) {
+					const regExp = /^{\"numFailedTestSuites/
+					const matches = regExp.exec(line)
+					if (matches && matches.length) {
+						const result = JSON.parse(line)
+
+						if (result.success) {
+							if (shouldExitEarly(processId)) {
+								// exit early
+								return
+							}
+							console.log('success!')
+							onSuccess()
+						} else {
+							console.log('NOT SUCCESS?')
 						}
-						onSuccess()
-					} else {
-						console.log('NOT SUCCESS?')
 					}
 				}
 			}
@@ -104,25 +121,23 @@ async function runTest({onSuccess, onFail, onRun, onError}: Props): Promise<void
 			const lines = stdout.split(/\r{0,1}\n/)
 
 			for (const line of lines) {
-				if (line.length === 0) {
-					continue
-				}
-
-				const dataRegExp = /^{\"numFailedTestSuites"/
-				const matches = dataRegExp.exec(line)
-
-				if (matches && matches.length) {
-					const result = JSON.parse(line)
-					const firstError = result.testResults.find((t: any) => t.status === 'failed')
-
-					if (firstError) {
-						if (shouldExitEarly(processId)) {
-							// exit early
-							return
+				if (line.length > 0) {
+					const dataRegExp = /^{\"numFailedTestSuites"/
+					const matches = dataRegExp.exec(line)
+
+					if (matches && matches.length) {
+						const result = JSON.parse(line)
+						const firstError = result.testResults.find((t: any) => t.status === 'failed')
+
+						if (firstError) {
+							if (shouldExitEarly(processId)) {
+								// exit early
+								return
+							}
+							onFail()
+						} else {
+							console.error('NOTE: PARSER DID NOT WORK FOR ', line)
 						}
-						onFail()
-					} else {
-						console.error('NOTE: PARSER DID NOT WORK FOR ', line)
 					}
 				}
 			}

src/actions/setupActions.ts

@@ -55,50 +55,51 @@ const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, actions: G.St
 	}
 
 	// run file watchers (listeners)
-	// if (listeners) {
-	// 	console.log('listeners')
-	// 	for (const listener of listeners) {
-	// 		if (!watchers[listener]) {
-	// 			const pattern = new vscode.RelativePattern(
-	// 				vscode.workspace.getWorkspaceFolder(workspaceRoot.uri)!,
-	// 				listener
-	// 			)
-	// 			console.log(pattern)
-	// 			watchers[listener] = vscode.workspace.createFileSystemWatcher(
-	// 				pattern
-	// 			)
-	// 			watchers[listener].onDidChange(() => {
-	// 				console.log('onDidChange')
-	// 				// trigger save
-	// 				vscode.commands.executeCommand('coderoad.run_test', null, () => {
-	// 					// cleanup watcher on success
-	// 					disposeWatcher(listener)
-	// 				})
-	// 			})
-	// 			watchers[listener].onDidCreate(() => {
-	// 				console.log('onDidCreate')
-	// 				// trigger save
-	// 				vscode.commands.executeCommand('coderoad.run_test', null, () => {
-	// 					// cleanup watcher on success
-	// 					disposeWatcher(listener)
-	// 				})
-	// 			})
-	// 			watchers[listener].onDidDelete(() => {
-	// 				console.log('onDidDelete')
-	// 				// trigger save
-	// 				vscode.commands.executeCommand('coderoad.run_test', null, () => {
-	// 					// cleanup watcher on success
-	// 					disposeWatcher(listener)
-	// 				})
-	// 			})
-	// 		}
-	// 	}
-	// } else {
-	// 	// remove all watchers
-	// 	for (const listener of Object.keys(watchers)) {
-	// 		disposeWatcher(listener)
-	// 	}
-	// }
+	if (listeners) {
+		console.log('listeners')
+		for (const listener of listeners) {
+			if (!watchers[listener]) {
+				const pattern = new vscode.RelativePattern(
+					vscode.workspace.getWorkspaceFolder(workspaceRoot.uri)!,
+					listener
+				)
+				console.log(pattern)
+				const listen = vscode.workspace.createFileSystemWatcher(
+					pattern
+				)
+				watchers[listener] = listen
+				watchers[listener].onDidChange(() => {
+					console.log('onDidChange')
+					// trigger save
+					vscode.commands.executeCommand('coderoad.run_test', null, () => {
+						// cleanup watcher on success
+						disposeWatcher(listener)
+					})
+				})
+				watchers[listener].onDidCreate(() => {
+					console.log('onDidCreate')
+					// trigger save
+					vscode.commands.executeCommand('coderoad.run_test', null, () => {
+						// cleanup watcher on success
+						disposeWatcher(listener)
+					})
+				})
+				watchers[listener].onDidDelete(() => {
+					console.log('onDidDelete')
+					// trigger save
+					vscode.commands.executeCommand('coderoad.run_test', null, () => {
+						// cleanup watcher on success
+						disposeWatcher(listener)
+					})
+				})
+			}
+		}
+	} else {
+		// remove all watchers
+		for (const listener of Object.keys(watchers)) {
+			disposeWatcher(listener)
+		}
+	}
 
 	// run command
 	if (commands) {

typings/index.d.ts

@@ -74,6 +74,7 @@ export interface MachineStateSchema {
 						TestRunning: {}
 						TestPass: {}
 						TestFail: {}
+						TestError: {}
 						StepNext: {}
 						LevelComplete: {}
 					}

web-app/.vscode/settings.json

@@ -0,0 +1 @@
+{}

web-app/src/services/state/machine.ts

@@ -134,9 +134,15 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 										actions: ['updateStepProgress']
 									},
 									TEST_FAIL: 'TestFail',
-									TEST_ERROR: 'Normal'
+									TEST_ERROR: 'TestError'
 								},
 							},
+							TestError: {
+								onEntry: ['testFail'],
+								after: {
+									0: 'Normal'
+								}
+							},
 							TestPass: {
 								onExit: ['updateStepPosition'],
 								after: {