@sprucelabs/spruce-cli 15.2.23 → 15.2.24

package/src/__tests__/behavioral/{UpgradingANodeModule.test.ts → upgrading/UpgradingANodeModule.test.ts}

@@ -1,8 +1,8 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test'
-import CommandService from '../../services/CommandService'
-import AbstractCliTest from '../../tests/AbstractCliTest'
-import uiAssert from '../../tests/utilities/uiAssert.utility'
+import CommandService from '../../../services/CommandService'
+import AbstractCliTest from '../../../tests/AbstractCliTest'
+import uiAssert from '../../../tests/utilities/uiAssert.utility'
 
 export default class UpgradingANodeModuleTest extends AbstractCliTest {
 	protected static async beforeEach() {
@@ -16,9 +16,9 @@ export default class UpgradingANodeModuleTest extends AbstractCliTest {
 
 	@test()
 	protected static async buildErrorsGetPassedThroughToResults() {
-		CommandService.setMockResponse(/yarn (add|install)/gis, { code: 0 })
-		CommandService.setMockResponse(/yarn clean.build/gis, { code: 1 })
-		CommandService.setMockResponse(/yarn build.dev/gis, { code: 0 })
+		CommandService.fakeCommand(/yarn (add|install)/gis, { code: 0 })
+		CommandService.fakeCommand(/yarn clean.build/gis, { code: 1 })
+		CommandService.fakeCommand(/yarn build.dev/gis, { code: 0 })
 
 		await this.getEmitter().on('feature.did-execute', () => {
 			return {
@@ -52,7 +52,7 @@ export default class UpgradingANodeModuleTest extends AbstractCliTest {
 			diskUtil.writeFile(tsConfig, 'beenChanged')
 		}
 
-		CommandService.setMockResponse(/yarn/gi, {
+		CommandService.fakeCommand(/yarn/gi, {
 			code: 0,
 		})
 

package/src/__tests__/behavioral/{skill → upgrading}/UpgradingASkill.test.ts

@@ -6,29 +6,21 @@ import {
 	FILE_ACTION_OVERWRITE,
 	FILE_ACTION_SKIP,
 } from '../../../constants'
-import CommandService from '../../../services/CommandService'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 import { GeneratedFile } from '../../../types/cli.types'
 const BROKEN_SKILL_INDEX_CONTENTS = "throw new Error('cheese!')\n"
 export default class UpgradingASkillTest extends AbstractCliTest {
 	protected static async beforeEach() {
 		await super.beforeEach()
-		CommandService.setMockResponse(new RegExp(/yarn rebuild/gis), {
-			code: 0,
-		})
+		this.commandFaker.fakeRebuild()
 	}
 
 	@test()
 	protected static async forceEverythingUpgradeOverwritesWhatHasChanged() {
 		const cli = await this.installAndBreakSkill('skills')
 
-		CommandService.setMockResponse('yarn clean.build', {
-			code: 0,
-		})
-
-		CommandService.setMockResponse('yarn build.dev', {
-			code: 0,
-		})
+		this.commandFaker.fakeCleanBuild()
+		this.commandFaker.fakeBuild()
 
 		const files: {
 			name: string

package/src/__tests__/behavioral/{skill → upgrading}/UpgradingASkill2.test.ts

@@ -1,15 +1,12 @@
 import fsUtil from 'fs'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test'
-import CommandService from '../../../services/CommandService'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 import testUtil from '../../../tests/utilities/test.utility'
 export default class UpgradingASkill2Test extends AbstractCliTest {
 	protected static async beforeEach() {
 		await super.beforeEach()
-		CommandService.setMockResponse(new RegExp(/yarn rebuild/gis), {
-			code: 0,
-		})
+		this.commandFaker.fakeRebuild()
 	}
 
 	@test(
@@ -41,12 +38,12 @@ export default class UpgradingASkill2Test extends AbstractCliTest {
 	) {
 		await this.FeatureFixture().installCachedFeatures(cacheKey)
 
-		shouldMockYarn && CommandService.setMockResponse(/yarn/, { code: 0 })
+		shouldMockYarn && this.commandFaker.fakeCommand(/yarn/, 0)
 
 		const pluginPath = this.resolveHashSprucePath(`features/${pluginName}`)
 		const originalContents = diskUtil.readFile(pluginPath)
 
-		diskUtil.writeFile(pluginPath, 'aoeuaoeuaoeuaoeu')
+		diskUtil.writeFile(pluginPath, 'aoeuaoeuao-euaoeu')
 
 		const results = await this.Action('node', 'upgrade').execute({})
 
@@ -173,7 +170,7 @@ export default class UpgradingASkill2Test extends AbstractCliTest {
 		const originalContents = diskUtil.readFile(match)
 		diskUtil.writeFile(match, 'broken')
 
-		CommandService.setMockResponse(/yarn/, { code: 0 })
+		this.commandFaker.fakeCommand(/yarn/, 0)
 
 		await this.Action('node', 'upgrade').execute({})
 

package/src/__tests__/behavioral/{skill → upgrading}/UpgradingASkill3.test.ts

@@ -16,7 +16,7 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
 		}
 
 		await super.beforeEach()
-		CommandService.setMockResponse(new RegExp(/yarn rebuild/gis), {
+		CommandService.fakeCommand(new RegExp(/yarn rebuild/gis), {
 			code: 0,
 		})
 	}
@@ -92,7 +92,7 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
 			return {}
 		}
 
-		CommandService.setMockResponse('yarn clean.build', {
+		CommandService.fakeCommand('yarn clean.build', {
 			code: 0,
 			callback: () => {
 				wasCleanBuildCalled = true
@@ -101,7 +101,7 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
 
 		let wasBuildDevCalled = false
 
-		CommandService.setMockResponse('yarn build.dev', {
+		CommandService.fakeCommand('yarn build.dev', {
 			code: 0,
 			callback: () => {
 				wasBuildDevCalled = true
@@ -216,17 +216,17 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
 	private static disableCleanBuildAndYarnAdd() {
 		this.disableCleanAndBuild()
 
-		CommandService.setMockResponse(/yarn.*?add/gis, {
+		CommandService.fakeCommand(/yarn.*?add/gis, {
 			code: 0,
 		})
 	}
 
 	private static disableCleanAndBuild() {
-		CommandService.setMockResponse('yarn clean.build', {
+		CommandService.fakeCommand('yarn clean.build', {
 			code: 0,
 		})
 
-		CommandService.setMockResponse('yarn build.dev', {
+		CommandService.fakeCommand('yarn build.dev', {
 			code: 0,
 		})
 	}

package/src/__tests__/behavioral/{skill → upgrading}/UpgradingASkill4.test.ts

@@ -7,7 +7,7 @@ import AbstractCliTest from '../../../tests/AbstractCliTest'
 export default class UpgradingASkill4Test extends AbstractCliTest {
 	protected static async beforeEach() {
 		await super.beforeEach()
-		CommandService.setMockResponse(new RegExp(/yarn rebuild/gis), {
+		CommandService.fakeCommand(new RegExp(/yarn rebuild/gis), {
 			code: 0,
 		})
 	}
@@ -46,8 +46,8 @@ export default class UpgradingASkill4Test extends AbstractCliTest {
 			}
 		}
 
-		CommandService.setMockResponse(/yarn clean/, { code: 0 })
-		CommandService.setMockResponse(/yarn build.dev/, { code: 0 })
+		CommandService.fakeCommand(/yarn clean/, { code: 0 })
+		CommandService.fakeCommand(/yarn build.dev/, { code: 0 })
 
 		await this.Action('node', 'upgrade').execute({})
 

package/src/__tests__/behavioral/{skill → upgrading}/UpgradingASkill5.test.ts

@@ -35,7 +35,7 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
 	) {
 		await this.FeatureFixture().installCachedFeatures('schemas')
 
-		CommandService.setMockResponse(new RegExp(/yarn/gis), {
+		CommandService.fakeCommand(new RegExp(/yarn/gis), {
 			code: 0,
 		})
 
@@ -75,7 +75,7 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
 		let wasMovedBackToDev = false
 		let wasMovedBackToProd = false
 
-		CommandService.setMockResponse(new RegExp(/yarn/gis), {
+		CommandService.fakeCommand(new RegExp(/yarn/gis), {
 			code: 0,
 			callback: (_, args) => {
 				if (

package/src/__tests__/behavioral/{skill → upgrading}/UpgradingWithListeners.test.ts

@@ -2,7 +2,6 @@ import { eventResponseUtil } from '@sprucelabs/spruce-event-utils'
 import { test, assert } from '@sprucelabs/test'
 import SpruceError from '../../../errors/SpruceError'
 import { FeatureCode } from '../../../features/features.types'
-import CommandService from '../../../services/CommandService'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 
 export default class UpgradingWithListeners extends AbstractCliTest {
@@ -27,9 +26,7 @@ export default class UpgradingWithListeners extends AbstractCliTest {
 	) {
 		await this.FeatureFixture().installCachedFeatures(featureCode)
 
-		CommandService.setMockResponse(new RegExp(/yarn/), {
-			code: 0,
-		})
+		this.commandFaker.fakeCommand(new RegExp(/yarn/))
 
 		let wasHit = false
 
@@ -42,9 +39,10 @@ export default class UpgradingWithListeners extends AbstractCliTest {
 			}
 		)
 
-		const results = await this.getEmitter().emit('feature.will-execute', {
+		const results = await this.getEmitter().emit('feature.did-execute', {
 			featureCode: 'node',
 			actionCode,
+			results: {},
 		})
 
 		const { errors } = eventResponseUtil.getAllResponsePayloadsAndErrors(

package/src/__tests__/behavioral/{UpgradingWithSandboxFeatureInstalled.test.ts → upgrading/UpgradingWithSandboxFeatureInstalled.test.ts}

@@ -1,14 +1,14 @@
 import pathUtil from 'path'
 import { diskUtil, versionUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test'
-import AbstractCliTest from '../../tests/AbstractCliTest'
-import testUtil from '../../tests/utilities/test.utility'
+import AbstractCliTest from '../../../tests/AbstractCliTest'
+import testUtil from '../../../tests/utilities/test.utility'
 
 export default class UpgradingWithSandboxFeatureInstalledTest extends AbstractCliTest {
 	protected static async beforeEach() {
 		await super.beforeEach()
 		await this.FeatureFixture().installCachedFeatures('sandbox')
-		await this.listenToDidInstallInthePast()
+		await this.listenToDidInstallInThePast()
 	}
 
 	@test()
@@ -17,7 +17,7 @@ export default class UpgradingWithSandboxFeatureInstalledTest extends AbstractCl
 	}
 
 	@test()
-	protected static async usesTodaysVersionEvenWithCoreListene() {
+	protected static async usesTodaysVersionEvenWithCoreListener() {
 		const match = await this.setupAndGetListenerPath()
 
 		const fileName = pathUtil.basename(match)
@@ -63,7 +63,7 @@ export default class UpgradingWithSandboxFeatureInstalledTest extends AbstractCl
 		return results
 	}
 
-	private static async listenToDidInstallInthePast() {
+	private static async listenToDidInstallInThePast() {
 		const results = await this.Action('event', 'listen').execute({
 			namespace: 'mercury',
 			eventName: 'did-install::v2020_12_25',

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

@@ -265,7 +265,7 @@ export default class FeatureCommandExecuterContTest extends AbstractSchemaTest {
 	}
 
 	private static setupMockCommands() {
-		CommandService.setMockResponse(new RegExp(/npm.*?install .*?/gis), {
+		CommandService.fakeCommand(new RegExp(/npm.*?install .*?/gis), {
 			code: 0,
 		})
 	}

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

@@ -8,10 +8,10 @@ export default class ActionExecuter4Test extends AbstractCliTest {
 	protected static async beforeEach() {
 		await super.beforeEach()
 
-		CommandService.setMockResponse(/which docker/gis, {
+		CommandService.fakeCommand(/which docker/gis, {
 			code: 0,
 		})
-		CommandService.setMockResponse(ENABLE_NPM_CACHE_COMMAND, {
+		CommandService.fakeCommand(ENABLE_NPM_CACHE_COMMAND, {
 			code: 0,
 		})
 	}

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

@@ -14,6 +14,7 @@ import { errorAssert } from '@sprucelabs/test-utils'
 import CreateAction from '../../features/event/actions/CreateAction'
 import EventStore from '../../features/event/stores/EventStore'
 import AbstractEventTest from '../../tests/AbstractEventTest'
+import { DEMO_NUMBER_EVENT_STORE } from '../../tests/constants'
 import testUtil from '../../tests/utilities/test.utility'
 
 const EVENT_NAME_READABLE = 'my event store amazing event'
@@ -30,6 +31,7 @@ export default class EventStoreTest extends AbstractEventTest {
 		await super.beforeEach()
 		this.createAction = this.Action<CreateAction>('event', 'create')
 		diskUtil.writeFile(this.resolvePath('package.json'), '{}')
+		await this.people.loginAsDemoPerson(DEMO_NUMBER_EVENT_STORE)
 	}
 
 	@test()
@@ -83,7 +85,7 @@ export default class EventStoreTest extends AbstractEventTest {
 						}),
 						emitPermissionContract: buildPermissionContract({
 							id: 'my-fantastic-event-contract',
-							name: 'Fanstastic emit perms',
+							name: 'Fantastic emit perms',
 							permissions: [
 								{
 									id: 'can-emit-perms',

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

@@ -10,7 +10,7 @@ export default class LintServiceTest extends AbstractCliTest {
 
 		await this.FeatureFixture().installCachedFeatures('skills')
 
-		CommandService.setMockResponse(/node/, {
+		CommandService.fakeCommand(/node/, {
 			code: 0,
 			stdout: `[{"filePath":"/Users/taylorromero/Development/SpruceLabs/spruce-appointments-skill/src/.spruce/stores/stores.types.ts","messages":[{"fatal":false,"severity":1,"message":"File ignored by default.  Use a negated ignore pattern (like \\"--ignore-pattern '!<relative/path/to/filename>'\\") to override."}],"errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":[]}]\n`,
 		})
@@ -24,7 +24,7 @@ export default class LintServiceTest extends AbstractCliTest {
 
 		await this.FeatureFixture().installCachedFeatures('skills')
 
-		CommandService.setMockResponse(/node/, {
+		CommandService.fakeCommand(/node/, {
 			code: 0,
 			stdout: `[{"filePath":"/Users/taylorromero/Development/SpruceLabs/spruce-appointments-skill/src/.spruce/stores/stores.types.ts","messages":[{"fatal":false,"severity":1,"message":"File ignored by default.  Use a negated ignore pattern (like \\"--ignore-pattern '!<relative/path/to/filename>'\\") to override."}],"errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":[]}]\n`,
 		})

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

@@ -26,7 +26,7 @@ export default class PkgServiceTest extends AbstractSkillTest {
 
 	@test()
 	protected static async handlesAtLatestInName() {
-		CommandService.setMockResponse(new RegExp(/yarn/gis), {
+		CommandService.fakeCommand(new RegExp(/yarn/gis), {
 			code: 0,
 		})
 
@@ -37,12 +37,9 @@ export default class PkgServiceTest extends AbstractSkillTest {
 
 	@test()
 	protected static async ifInstallingOnlySpruceModulesShouldNotRunNPMAdd() {
-		CommandService.setMockResponse(
-			new RegExp(/npm.*?install.*?--no-progress/gis),
-			{
-				code: 1,
-			}
-		)
+		CommandService.fakeCommand(new RegExp(/npm.*?install.*?--no-progress/gis), {
+			code: 1,
+		})
 
 		const { totalInstalled } = await this.pkg.install(
 			'@sprucelabs/jest-json-reporter'

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

@@ -7,7 +7,7 @@ export default class StoreFeatureTest extends AbstractCliTest {
 	protected static async syncsOnWillExecute() {
 		await this.FeatureFixture().installCachedFeatures('stores')
 
-		CommandService.setMockResponse(/yarn/, {
+		CommandService.fakeCommand(/yarn/, {
 			code: 0,
 		})
 

package/src/cli.ts

@@ -466,7 +466,7 @@ export async function run(argv: string[] = []): Promise<void> {
 async function setupInFlightEntertainment(ui: TerminalInterface) {
 	if (
 		TerminalInterface.doesSupportColor() &&
-		process.env.ENABLE_INSTALL_INTERTAINMENT !== 'false'
+		process.env.ENABLE_INSTALL_ENTERTAINMENT !== 'false'
 	) {
 		const command = new CommandService(diskUtil.resolvePath(__dirname, '../'))
 		InFlightEntertainment.setup({ command, ui })

package/src/features/event/EventFeature.ts

@@ -102,25 +102,24 @@ export default class EventFeature extends AbstractFeature {
 		}
 
 		const isInstalled = await this.featureInstaller.isInstalled('event')
-
-		if (
+		const isRemoteRelevant =
 			isInstalled &&
 			(featureCode === 'event' ||
 				featureCode === 'eventContract' ||
 				actionCode === 'login') &&
 			actionCode !== 'setRemote'
-		) {
+
+		if (isRemoteRelevant) {
 			const remoteResults = await this.appendRemoteToResultsOrPrompt()
 			results = actionUtil.mergeActionResults(results, remoteResults)
 		}
 
-		if (featureCode === 'node' && actionCode === 'upgrade' && isInstalled) {
-			const syncResults = await this.Action('event', 'sync.listeners').execute(
-				{}
-			)
-			results = actionUtil.mergeActionResults(results, syncResults)
-		}
+		return results
+	}
 
+	private async syncListenersAndMixinResults(results: FeatureActionResponse) {
+		const syncResults = await this.Action('event', 'sync.listeners').execute({})
+		results = actionUtil.mergeActionResults(results, syncResults)
 		return results
 	}
 
@@ -133,8 +132,12 @@ export default class EventFeature extends AbstractFeature {
 
 		let results = {}
 
-		if (isInstalled && featureCode === 'node' && actionCode === 'upgrade') {
-			results = this.Action('event', 'sync').execute({})
+		const isUpgrade =
+			isInstalled && featureCode === 'node' && actionCode === 'upgrade'
+
+		if (isUpgrade) {
+			results = await this.Action('event', 'sync').execute({})
+			results = await this.syncListenersAndMixinResults(results)
 		}
 
 		if (this.initiatingAction === this.combineCodes(featureCode, actionCode)) {

package/src/features/event/actions/ListenAction.ts

@@ -21,6 +21,7 @@ import EventTemplateItemBuilder from '../../../templateItemBuilders/EventTemplat
 import actionUtil from '../../../utilities/action.utility'
 import AbstractAction from '../../AbstractAction'
 import { FeatureActionResponse } from '../../features.types'
+import { FetchContractsOptions } from '../stores/EventStore'
 
 const SKILL_EVENT_NAMESPACE = 'skill'
 const CORE_EVENT_NAMESPACE = 'mercury'
@@ -163,22 +164,31 @@ export default class ListenAction extends AbstractAction<OptionsSchema> {
 			namespace !== SKILL_EVENT_NAMESPACE &&
 			namespace !== CORE_EVENT_NAMESPACE
 				? [namespace]
-				: undefined
-
-		const { contracts } = skill.slug
-			? await eventStore.fetchEventContracts({
-					localNamespace: skill.slug,
-					namespaces: namespacesForFetch,
-					didUpdateHandler: (msg: string) => this.ui.startLoading(msg),
-			  })
-			: await eventStore.fetchEventContracts({
-					namespaces: namespacesForFetch,
-					didUpdateHandler: (msg: string) => this.ui.startLoading(msg),
-			  })
+				: this.getDependencyNamespaces()
+
+		const options: FetchContractsOptions = {
+			didUpdateHandler: (msg: string) => this.ui.startLoading(msg),
+		}
+
+		if (skill.slug) {
+			options.localNamespace = skill.slug
+		}
+
+		if (namespacesForFetch.length > 0) {
+			options.namespaces = namespacesForFetch
+		}
+
+		const { contracts } = await eventStore.fetchEventContracts(options)
 
 		return contracts
 	}
 
+	private getDependencyNamespaces() {
+		return this.Service('dependency')
+			.get()
+			.map((d) => d.namespace)
+	}
+
 	private async syncEvents(
 		options: SpruceSchemas.SpruceCli.v2020_07_22.ListenEventOptions
 	) {

package/src/features/event/stores/EventStore.ts

@@ -53,6 +53,12 @@ const eventFileNamesImportKeyMap = {
 	'listenPermissions.builder.ts': { key: 'listenPermissions', isSchema: false },
 }
 
+export interface FetchContractsOptions {
+	localNamespace?: string
+	namespaces?: string[]
+	didUpdateHandler?: InternalUpdateHandler
+}
+
 export default class EventStore extends AbstractStore {
 	public name = 'event'
 	protected static contractCache: Record<string, any> = {}
@@ -63,11 +69,9 @@ export default class EventStore extends AbstractStore {
 		EventStore.contractCache = {}
 	}
 
-	public async fetchEventContracts(options?: {
-		localNamespace?: string
-		namespaces?: string[]
-		didUpdateHandler?: InternalUpdateHandler
-	}): Promise<EventStoreFetchEventContractsResponse> {
+	public async fetchEventContracts(
+		options?: FetchContractsOptions
+	): Promise<EventStoreFetchEventContractsResponse> {
 		const { localNamespace, didUpdateHandler, namespaces } = options ?? {}
 
 		didUpdateHandler?.('Pulling remote contracts...')
@@ -107,13 +111,14 @@ export default class EventStore extends AbstractStore {
 		if (!EventStore.contractCache[key]) {
 			const client = await this.connectToApi({ shouldAuthAsCurrentSkill: true })
 
-			const results = await client.emit('get-event-contracts::v2020_12_25', {
-				target: {
-					namespaces,
-				},
-			})
-
-			const { contracts } = eventResponseUtil.getFirstResponseOrThrow(results)
+			const [{ contracts }] = await client.emitAndFlattenResponses(
+				'get-event-contracts::v2020_12_25',
+				{
+					target: {
+						namespaces,
+					},
+				}
+			)
 
 			EventStore.contractCache[key] = contracts
 		}

package/src/features/store/StoreFeature.ts

@@ -38,7 +38,7 @@ export default class StoreFeature extends AbstractFeature {
 		)
 		void this.emitter.on(
 			'feature.will-execute',
-			this.handleWillExecute.bind(this)
+			this.handleDidExecute.bind(this)
 		)
 	}
 
@@ -55,20 +55,21 @@ export default class StoreFeature extends AbstractFeature {
 		}
 	}
 
-	private async handleWillExecute(payload: {
+	private async handleDidExecute(payload: {
 		featureCode: string
 		actionCode: string
 	}) {
 		const isInstalled = await this.featureInstaller.isInstalled('store')
 
-		if (
+		const isUpgrade =
 			isInstalled &&
 			payload.featureCode === 'node' &&
 			payload.actionCode === 'upgrade'
-		) {
+
+		if (isUpgrade) {
 			uiUtil.renderMasthead({
 				ui: this.ui,
-				headline: 'Resyncing data stores...',
+				headline: 'Re-syncing data stores...',
 			})
 
 			const results = await this.Action('store', 'sync').execute({})

package/src/services/CommandService.ts

@@ -184,10 +184,7 @@ export default class CommandService {
 		return { mockResponse: match?.response, mockKey }
 	}
 
-	public static setMockResponse(
-		command: string | RegExp,
-		response: MockResponse
-	) {
+	public static fakeCommand(command: string | RegExp, response: MockResponse) {
 		this.mockResponses.unshift({
 			command,
 			response,

package/src/tests/AbstractCliTest.ts

@@ -35,6 +35,7 @@ import StoreFactory, {
 import { ApiClientFactoryOptions } from '../types/apiClient.types'
 import { OptionOverrides } from '../types/cli.types'
 import WriterFactory from '../writers/WriterFactory'
+import CommandFaker from './CommandFaker'
 import FeatureFixture, {
 	FeatureFixtureOptions,
 } from './fixtures/FeatureFixture'
@@ -52,6 +53,7 @@ type ExecuterOptions = Partial<ActionExecuterOptions> & {
 export default abstract class AbstractCliTest extends AbstractSpruceTest {
 	protected static cliRoot = pathUtil.join(__dirname, '..')
 	protected static homeDir: string
+	protected static commandFaker: CommandFaker
 
 	private static _ui: SpyInterface
 	private static emitter?: GlobalEmitter
@@ -72,7 +74,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
 		ImportService.setCacheDir(diskUtil.createRandomTempDir())
 		ImportService.enableCaching()
 
-		process.env.ENABLE_INSTALL_INTERTAINMENT = 'false'
+		process.env.ENABLE_INSTALL_ENTERTAINMENT = 'false'
 
 		this.originalEnv = { ...process.env }
 	}
@@ -106,6 +108,9 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
 		EventStore.clearCache()
 		CommandService.clearMockResponses()
 		MercuryClientFactory.reset()
+		MercuryClientFactory.setIsTestMode(false)
+
+		this.commandFaker = new CommandFaker()
 	}
 
 	protected static async afterEach() {

package/src/tests/CommandFaker.ts

@@ -0,0 +1,24 @@
+import CommandService from '../services/CommandService'
+
+type Command = RegExp | string
+
+export default class CommandFaker {
+	public fakeRebuild(code = 0) {
+		const command = new RegExp(/yarn rebuild/gis)
+		this.fakeCommand(command, code)
+	}
+
+	public fakeCommand(command: Command, code = 0) {
+		CommandService.fakeCommand(command, {
+			code,
+		})
+	}
+
+	public fakeCleanBuild(code = 0) {
+		this.fakeCommand('yarn clean.build', code)
+	}
+
+	public fakeBuild(code = 0) {
+		this.fakeCommand('yarn build.dev', code)
+	}
+}