@sprucelabs/spruce-cli 19.1.5 → 19.1.6

package/src/__tests__/behavioral/tests/RunningTests.test.ts

@@ -3,6 +3,13 @@ import { errorAssert } from '@sprucelabs/test-utils'
 import AbstractTestTest from '../../../tests/AbstractTestTest'
 
 export default class RunningTestsTest extends AbstractTestTest {
+	private static hasCreatedTest: any
+
+	protected static async beforeEach(): Promise<void> {
+		await super.beforeEach()
+		this.hasCreatedTest = false
+	}
+
 	@test()
 	protected static async hasTestAction() {
 		await this.Cli()
@@ -12,35 +19,24 @@ export default class RunningTestsTest extends AbstractTestTest {
 	@test()
 	protected static async runningTestsActuallyRunsTests() {
 		await this.installTests()
-		const creationPromise = this.Action('test', 'create').execute({
-			type: 'behavioral',
+
+		const creationResults = await this.createTest({
 			nameReadable: 'Can book appointment',
 			nameCamel: 'canBookAppointment',
 			namePascal: 'CanBookAppointment',
 		})
 
-		await this.waitForInput()
-		await this.ui.sendInput('')
-
-		const creationResults = await creationPromise
-
 		const file = creationResults.files?.[0]
 		assert.isTruthy(file)
 
 		this.fixBadTest(file.path)
 
-		const promise = this.Action('test', 'create').execute({
-			type: 'behavioral',
+		await this.createTest({
 			nameReadable: 'Can cancel appointment',
 			nameCamel: 'canCancelAppointment',
 			namePascal: 'CanCancelAppointment',
 		})
 
-		await this.waitForInput()
-		await this.ui.sendInput('')
-
-		await promise
-
 		await this.Service('build').build()
 
 		const results = await this.Action('test', 'test').execute({
@@ -66,4 +62,28 @@ export default class RunningTestsTest extends AbstractTestTest {
 			totalTodo: 0,
 		})
 	}
+
+	private static async createTest(options: {
+		nameReadable: string
+		nameCamel: string
+		namePascal: string
+	}) {
+		const creationPromise = this.Action('test', 'create').execute({
+			type: 'behavioral',
+			...options,
+		})
+
+		if (this.hasCreatedTest) {
+			await this.waitForInput()
+			await this.ui.sendInput({ path: '.' })
+		}
+
+		this.hasCreatedTest = true
+
+		await this.waitForInput()
+		await this.ui.sendInput('')
+
+		const creationResults = await creationPromise
+		return creationResults
+	}
 }

package/src/__tests__/behavioral/tests/SelectingAnAbstractTestClass.test.ts

@@ -42,14 +42,14 @@ export default class SelectingAnAbstractTestClassTest extends AbstractTestTest {
 	@test()
 	protected static async canSelectAbstractClassWhileSelectingSubDir() {
 		const testDir = this.resolvePath('src', '__tests__', 'behavioral', 'taco')
+
 		diskUtil.createDir(testDir)
 
 		await this.installAndCopyTestFiles()
 
 		const { promise } = await this.invokeCreateActionAndWaitForInput()
 
-		await this.ui.sendInput('taco')
-
+		await this.ui.sendInput({ path: 'taco' })
 		await this.waitForInput()
 
 		this.selectOptionBasedOnLabel('AbstractBananaTestDifferentThanFileName')

package/src/__tests__/implementation/TestRunner.test.ts

@@ -8,9 +8,11 @@ import { CliInterface } from '../../types/cli.types'
 
 export default class TestRunnerTest extends AbstractTestTest {
 	protected static testRunner: TestRunner
+	private static hasCreatedTest: boolean
 
 	protected static async beforeEach() {
 		await super.beforeEach()
+		this.hasCreatedTest = false
 		this.testRunner = new TestRunner({
 			cwd: this.cwd,
 			commandService: this.Service('command'),
@@ -143,6 +145,13 @@ export default class TestRunnerTest extends AbstractTestTest {
 		})
 
 		await this.waitForInput()
+		if (this.hasCreatedTest) {
+			await this.ui.sendInput('')
+			await this.waitForInput()
+		}
+
+		this.hasCreatedTest = true
+
 		await this.ui.sendInput('')
 
 		const results = await promise

package/src/features/test/actions/CreateAction.ts

@@ -38,10 +38,7 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
 		const candidates = await testFeature.buildParentClassCandidates()
 
 		if (diskUtil.doesDirExist(resolvedDestination)) {
-			resolvedDestination = await this.promptForSubDir(
-				resolvedDestination,
-				type
-			)
+			resolvedDestination = await this.promptForSubDir(resolvedDestination)
 		}
 
 		if (candidates.length > 0) {
@@ -70,34 +67,18 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
 			hints: ["run `spruce test` in your skill when you're ready!"],
 		}
 	}
-	private async promptForSubDir(resolvedDestination: string, type: string) {
-		const subdirs = diskUtil
-			.readDir(resolvedDestination)
-			.filter((d) =>
-				diskUtil.isDir(diskUtil.resolvePath(resolvedDestination, d))
-			)
-
-		if (subdirs.length > 0) {
-			const match = await this.ui.prompt({
-				type: 'select',
-				label: 'Where should I write this test?',
-				isRequired: true,
-				options: {
-					choices: [
-						{
-							value: '.',
-							label: `${type}`,
-						},
-						...subdirs.map((dir) => ({
-							value: `${dir}`,
-							label: `${type}/${dir}`,
-						})),
-					],
-				},
-			})
-
-			resolvedDestination = diskUtil.resolvePath(resolvedDestination, match)
-		}
+	private async promptForSubDir(resolvedDestination: string) {
+		const match = await this.ui.prompt({
+			type: 'directory',
+			label: 'Where should I write this test?',
+			isRequired: true,
+			defaultValue: {
+				path: diskUtil.resolvePath(resolvedDestination),
+			},
+		})
+
+		resolvedDestination = diskUtil.resolvePath(resolvedDestination, match.path)
+
 		return resolvedDestination
 	}
 

package/src/interfaces/SpyInterface.ts

@@ -91,11 +91,17 @@ export default class SpyInterface implements GraphicsInterface {
 		return this.invocations[this.invocations.length - 1]
 	}
 
-	public async sendInput(input: string | string[]): Promise<void> {
+	public async sendInput(input: Input): Promise<void> {
 		this.trackInvocation('sendInput', input)
 
 		this.optionallyRenderLine(
-			`Sending input: "${input.length > 0 ? input : 'ENTER'}"`
+			`Sending input: "${
+				(input as FilePromptInput).path
+					? (input as FilePromptInput).path
+					: (input as string).length > 0
+					? input
+					: 'ENTER'
+			}"`
 		)
 
 		if (this.waitForEnterResolver) {
@@ -114,7 +120,7 @@ export default class SpyInterface implements GraphicsInterface {
 
 			resolver(
 				input === '\n' ||
-					input.length === 0 ||
+					(input as string).length === 0 ||
 					(typeof input === 'string' && input.toLowerCase() === 'y')
 			)
 		} else {
@@ -360,3 +366,9 @@ export default class SpyInterface implements GraphicsInterface {
 		this.trackInvocation('clearBelowCursor')
 	}
 }
+
+type FilePromptInput = {
+	path: string
+}
+
+type Input = string | string[] | FilePromptInput

package/src/tests/utilities/uiAssert.utility.ts

@@ -36,6 +36,15 @@ const uiAssert = {
 		})
 	},
 
+	assertRendersDirectorySelect(ui: SpyInterface, defaultValue: string) {
+		const last = ui.getLastInvocation()
+
+		assert.doesInclude(last.options, {
+			type: 'directory',
+			defaultValue: { path: defaultValue },
+		})
+	},
+
 	async assertRendersConfirmWriteFile(ui: SpyInterface) {
 		await ui.waitForInput()