@sprucelabs/spruce-cli 24.0.0 → 24.1.1

package/src/__tests__/behavioral/upgrading/UpgradingANodeModule.test.ts

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

package/src/__tests__/behavioral/upgrading/UpgradingANonSpruceNodeModule.test.ts

@@ -1,6 +1,6 @@
 import { HASH_SPRUCE_DIR, diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert, generateId } from '@sprucelabs/test-utils'
-import CommandService from '../../../services/CommandService'
+import CommandServiceImpl from '../../../services/CommandService'
 import PkgService from '../../../services/PkgService'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 import ScriptUpdaterImpl, {
@@ -61,7 +61,7 @@ export default class UpgradingANonSpruceNodeModuleTest extends AbstractCliTest {
 
         let wasHit = false
 
-        CommandService.fakeCommand(/yarn.*?-W/, {
+        CommandServiceImpl.fakeCommand(/yarn.*?-W/, {
             code: 0,
             callback: () => {
                 wasHit = true
@@ -79,7 +79,7 @@ export default class UpgradingANonSpruceNodeModuleTest extends AbstractCliTest {
 
         const commands: string[] = []
 
-        CommandService.fakeCommand(/yarn.*?add .*/gis, {
+        CommandServiceImpl.fakeCommand(/yarn.*?add .*/gis, {
             code: 0,
             callback: (command, args) => {
                 commands.push([command, ...args].join(' '))
@@ -107,7 +107,7 @@ export default class UpgradingANonSpruceNodeModuleTest extends AbstractCliTest {
     protected static async runsUpgradeInEveryPackageInWorkspace() {
         this.setWorkspaces(['packages/*'])
 
-        CommandService.clearFakedResponses()
+        CommandServiceImpl.clearFakedResponses()
 
         const moduleName = 'test1'
         const path = this.resolvePath('packages', moduleName)

package/src/__tests__/behavioral/upgrading/UpgradingASkill3.test.ts

@@ -3,7 +3,7 @@ import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
 import SyncAction from '../../../features/error/actions/SyncAction'
 import UpdateDependenciesAction from '../../../features/node/actions/UpdateDependenciesAction'
-import CommandService from '../../../services/CommandService'
+import CommandServiceImpl from '../../../services/CommandService'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 import testUtil from '../../../tests/utilities/test.utility'
 export default class UpgradingASkill3Test extends AbstractCliTest {
@@ -17,14 +17,14 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
         }
 
         await super.beforeEach()
-        CommandService.fakeCommand(new RegExp(/yarn rebuild/gis), {
+        CommandServiceImpl.fakeCommand(new RegExp(/yarn rebuild/gis), {
             code: 0,
         })
     }
 
     @test()
     protected static async doesNotAddResolvePathAliasesToDependenciesAfterUpgrade() {
-        CommandService.clearFakedResponses()
+        CommandServiceImpl.clearFakedResponses()
         await this.FeatureFixture().installCachedFeatures('views')
 
         await this.Action('node', 'upgrade').execute({})
@@ -36,7 +36,7 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
 
     @test()
     protected static async featuresNotEnabledDontInstall() {
-        CommandService.clearFakedResponses()
+        CommandServiceImpl.clearFakedResponses()
         await this.FeatureFixture().installCachedFeatures('schemas')
 
         const results = await this.Action('node', 'upgrade').execute({})
@@ -93,7 +93,7 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
             return {}
         }
 
-        CommandService.fakeCommand('yarn clean.build', {
+        CommandServiceImpl.fakeCommand('yarn clean.build', {
             code: 0,
             callback: () => {
                 wasCleanBuildCalled = true
@@ -102,7 +102,7 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
 
         let wasBuildDevCalled = false
 
-        CommandService.fakeCommand('yarn build.dev', {
+        CommandServiceImpl.fakeCommand('yarn build.dev', {
             code: 0,
             callback: () => {
                 wasBuildDevCalled = true
@@ -217,17 +217,17 @@ export default class UpgradingASkill3Test extends AbstractCliTest {
     private static disableCleanBuildAndYarnAdd() {
         this.disableCleanAndBuild()
 
-        CommandService.fakeCommand(/yarn.*?add/gis, {
+        CommandServiceImpl.fakeCommand(/yarn.*?add/gis, {
             code: 0,
         })
     }
 
     private static disableCleanAndBuild() {
-        CommandService.fakeCommand('yarn clean.build', {
+        CommandServiceImpl.fakeCommand('yarn clean.build', {
             code: 0,
         })
 
-        CommandService.fakeCommand('yarn build.dev', {
+        CommandServiceImpl.fakeCommand('yarn build.dev', {
             code: 0,
         })
     }

package/src/__tests__/behavioral/upgrading/UpgradingASkill4.test.ts

@@ -1,13 +1,13 @@
 import fsUtil from 'fs'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
-import CommandService from '../../../services/CommandService'
+import CommandServiceImpl from '../../../services/CommandService'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 
 export default class UpgradingASkill4Test extends AbstractCliTest {
     protected static async beforeEach() {
         await super.beforeEach()
-        CommandService.fakeCommand(new RegExp(/rebuild/gis), {
+        CommandServiceImpl.fakeCommand(new RegExp(/rebuild/gis), {
             code: 0,
         })
     }
@@ -49,8 +49,8 @@ export default class UpgradingASkill4Test extends AbstractCliTest {
             }
         }
 
-        CommandService.fakeCommand(/yarn clean/, { code: 0 })
-        CommandService.fakeCommand(/yarn build.dev/, { code: 0 })
+        CommandServiceImpl.fakeCommand(/yarn clean/, { code: 0 })
+        CommandServiceImpl.fakeCommand(/yarn build.dev/, { code: 0 })
 
         await this.Action('node', 'upgrade').execute({})
 

package/src/__tests__/behavioral/upgrading/UpgradingASkill5.test.ts

@@ -2,7 +2,7 @@ import { Schema } from '@sprucelabs/schema'
 import { test, assert } from '@sprucelabs/test-utils'
 import ActionFactory from '../../../features/ActionFactory'
 import { FeatureAction } from '../../../features/features.types'
-import CommandService from '../../../services/CommandService'
+import CommandServiceImpl from '../../../services/CommandService'
 import LintService from '../../../services/LintService'
 import ServiceFactory from '../../../services/ServiceFactory'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
@@ -50,7 +50,7 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
     ) {
         await this.FeatureFixture().installCachedFeatures('schemas')
 
-        CommandService.fakeCommand(new RegExp(/yarn/gis), {
+        CommandServiceImpl.fakeCommand(new RegExp(/yarn/gis), {
             code: 0,
         })
 
@@ -93,7 +93,7 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
         let wasMovedBackToDev = false
         let wasMovedBackToProd = false
 
-        CommandService.fakeCommand(new RegExp(/yarn/gis), {
+        CommandServiceImpl.fakeCommand(new RegExp(/yarn/gis), {
             code: 0,
             callback: (_, args) => {
                 if (
@@ -126,7 +126,7 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
 
         ServiceFactory.setFactoryClass('lint', SpyLintService)
 
-        CommandService.fakeCommand(/.*/gi, {
+        CommandServiceImpl.fakeCommand(/.*/gi, {
             code: 0,
             callback: (command, args) => {
                 this.invocationLog.push([command, ...args].join(' '))

package/src/__tests__/behavioral/versions/ResolvingVersions.test.ts

@@ -47,7 +47,6 @@ export default class ResolvingVersionsTest extends AbstractSkillTest {
 
     @test()
     protected static async addsVersionFromPackageJsonWhenChoosingDifferentVersion() {
-        debugger
         await this.resolveAndAssertChoices([
             this.newVersionChoice,
             this.buildVersionChoice('v2023_09_16'),
@@ -56,9 +55,8 @@ export default class ResolvingVersionsTest extends AbstractSkillTest {
 
     @test()
     protected static async doesNotAddVersionToChoicesIfDirMatchesVersion() {
-        debugger
         this.createVersionDir('v2023_09_16')
-        debugger
+
         await this.resolveAndAssertChoices([
             this.newVersionChoice,
             this.buildVersionChoice('v2023_09_16'),

package/src/__tests__/behavioral/views/WatchingSkillViews.test.ts

@@ -1,6 +1,6 @@
 import { test, assert } from '@sprucelabs/test-utils'
 import WatchAction from '../../../features/view/actions/WatchAction'
-import CommandService from '../../../services/CommandService'
+import CommandServiceImpl from '../../../services/CommandService'
 import AbstractSkillTest from '../../../tests/AbstractSkillTest'
 
 export default class WatchingSkillViewsTest extends AbstractSkillTest {
@@ -21,7 +21,7 @@ export default class WatchingSkillViewsTest extends AbstractSkillTest {
     @test()
     protected static async shouldCallBoot() {
         let wasHit = false
-        CommandService.fakeCommand(
+        CommandServiceImpl.fakeCommand(
             'SHOULD_WATCH_VIEWS=true MAXIMUM_LOG_PREFIXES_LENGTH=0 yarn boot',
             {
                 code: 200,

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

@@ -5,7 +5,7 @@ import {
     FeatureActionResponse,
     FeatureInstallResponse,
 } from '../../features/features.types'
-import CommandService from '../../services/CommandService'
+import CommandServiceImpl from '../../services/CommandService'
 import AbstractSchemaTest from '../../tests/AbstractSchemaTest'
 import testUtil from '../../tests/utilities/test.utility'
 
@@ -273,7 +273,7 @@ export default class FeatureCommandExecuterContTest extends AbstractSchemaTest {
     }
 
     private static fakeInstallCommands() {
-        CommandService.fakeCommand(new RegExp(/yarn|npm/gis), {
+        CommandServiceImpl.fakeCommand(new RegExp(/yarn|npm/gis), {
             code: 0,
         })
     }

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

@@ -1,17 +1,17 @@
 import { test, assert } from '@sprucelabs/test-utils'
 import { errorAssert } from '@sprucelabs/test-utils'
 import { ENABLE_NPM_CACHE_COMMAND } from '../../features/cache/constants'
-import CommandService from '../../services/CommandService'
+import CommandServiceImpl from '../../services/CommandService'
 import AbstractCliTest from '../../tests/AbstractCliTest'
 
 export default class ActionExecuter4Test extends AbstractCliTest {
     protected static async beforeEach() {
         await super.beforeEach()
 
-        CommandService.fakeCommand(/which docker/gis, {
+        CommandServiceImpl.fakeCommand(/which docker/gis, {
             code: 0,
         })
-        CommandService.fakeCommand(ENABLE_NPM_CACHE_COMMAND, {
+        CommandServiceImpl.fakeCommand(ENABLE_NPM_CACHE_COMMAND, {
             code: 0,
         })
     }

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

@@ -1,6 +1,6 @@
 import { test, assert } from '@sprucelabs/test-utils'
 import FeatureInstaller from '../../features/FeatureInstaller'
-import CommandService from '../../services/CommandService'
+import CommandServiceImpl from '../../services/CommandService'
 import AbstractCliTest from '../../tests/AbstractCliTest'
 
 export default class FeatureInstallerTest extends AbstractCliTest {
@@ -28,7 +28,7 @@ export default class FeatureInstallerTest extends AbstractCliTest {
 
     @test()
     protected static async afterPackageInstallIsCalledOncePerFeature() {
-        CommandService.fakeCommand(/yarn/, {
+        CommandServiceImpl.fakeCommand(/yarn/, {
             code: 0,
         })
 

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

@@ -26,7 +26,9 @@ export default class OrganizationStoreTest extends AbstractCliTest {
         assert.isFalse(isInstalled)
     }
 
-    @test()
+    @test.skip(
+        'conflicting with "InstallingASkillAtAnOrg which is deleting orgs'
+    )
     protected static async canDeleteOrg() {
         await this.FeatureFixture().installCachedFeatures('organizations')
 
@@ -68,7 +70,9 @@ export default class OrganizationStoreTest extends AbstractCliTest {
         assert.isTrue(isInstalled)
     }
 
-    @test()
+    @test.skip(
+        'is conflicting with "InstallingASkillAtAnOrg" which is deleting orgs'
+    )
     protected static async canGetMyOrgs() {
         await this.FeatureFixture().installCachedFeatures('organizations')
 

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

@@ -1,6 +1,6 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
-import CommandService from '../../services/CommandService'
+import CommandServiceImpl from '../../services/CommandService'
 import PkgService from '../../services/PkgService'
 import AbstractSkillTest from '../../tests/AbstractSkillTest'
 
@@ -26,7 +26,7 @@ export default class PkgServiceTest extends AbstractSkillTest {
 
     @test()
     protected static async handlesAtLatestInName() {
-        CommandService.fakeCommand(new RegExp(/yarn/gis), {
+        CommandServiceImpl.fakeCommand(new RegExp(/yarn/gis), {
             code: 0,
         })
 
@@ -37,7 +37,7 @@ export default class PkgServiceTest extends AbstractSkillTest {
 
     @test()
     protected static async ifInstallingOnlySpruceModulesShouldNotRunNPMAdd() {
-        CommandService.fakeCommand(
+        CommandServiceImpl.fakeCommand(
             new RegExp(/npm.*?install.*?--no-progress/gis),
             {
                 code: 1,

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

@@ -1,5 +1,5 @@
 import { test, assert } from '@sprucelabs/test-utils'
-import CommandService from '../../services/CommandService'
+import CommandServiceImpl from '../../services/CommandService'
 import AbstractCliTest from '../../tests/AbstractCliTest'
 
 export default class StoreFeatureTest extends AbstractCliTest {
@@ -7,7 +7,7 @@ export default class StoreFeatureTest extends AbstractCliTest {
     protected static async syncsOnWillExecute() {
         await this.FeatureFixture().installCachedFeatures('stores')
 
-        CommandService.fakeCommand(/yarn/, {
+        CommandServiceImpl.fakeCommand(/yarn/, {
             code: 0,
         })
 

package/src/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/AnotherStaticTest.test.ts

@@ -0,0 +1,33 @@
+import { fake } from '@sprucelabs/spruce-test-fixtures'
+import AbstractSpruceTest, {
+    test,
+    assert,
+    errorAssert,
+} from '@sprucelabs/test-utils'
+
+@fake.login()
+export default class StaticTestFinderTest extends AbstractSpruceTest {
+    @test()
+    protected static async throwsWithMissing() {
+        const finder = StaticTestFinder.Finder()
+        const err = await assert.doesThrowAsync(() => finder.find())
+        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
+            parameters: ['lookupDir'],
+        })
+    }
+
+    @test()
+    protected static async yourNextTest() {
+        assert.isTrue(false)
+    }
+}
+
+class StaticTestFinder {
+    public static Finder() {
+        return new this()
+    }
+
+    public async find() {
+        // assertOptions({}, ['lookupDir'])
+    }
+}

package/src/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/StaticTest1.test.ts

@@ -0,0 +1,33 @@
+import { fake } from '@sprucelabs/spruce-test-fixtures'
+import AbstractSpruceTest, {
+    test,
+    assert,
+    errorAssert,
+} from '@sprucelabs/test-utils'
+
+@fake.login()
+export default class StaticTestFinderTest extends AbstractSpruceTest {
+    @test()
+    protected static async throwsWithMissing() {
+        const finder = StaticTestFinder.Finder()
+        const err = await assert.doesThrowAsync(() => finder.find())
+        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
+            parameters: ['lookupDir'],
+        })
+    }
+
+    @test()
+    protected static async yourNextTest() {
+        assert.isTrue(false)
+    }
+}
+
+class StaticTestFinder {
+    public static Finder() {
+        return new this()
+    }
+
+    public async find() {
+        // assertOptions({}, ['lookupDir'])
+    }
+}

package/src/__tests__/testDirsAndFiles/static_test_migration_2/src/__tests__/AStaticTest.test.ts

@@ -0,0 +1,33 @@
+import { fake } from '@sprucelabs/spruce-test-fixtures'
+import AbstractSpruceTest, {
+    test,
+    assert,
+    errorAssert,
+} from '@sprucelabs/test-utils'
+
+@fake.login()
+export default class StaticTestFinderTest extends AbstractSpruceTest {
+    @test()
+    protected static async throwsWithMissing() {
+        const finder = StaticTestFinder.Finder()
+        const err = await assert.doesThrowAsync(() => finder.find())
+        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
+            parameters: ['lookupDir'],
+        })
+    }
+
+    @test()
+    protected static async yourNextTest() {
+        assert.isTrue(false)
+    }
+}
+
+class StaticTestFinder {
+    public static Finder() {
+        return new this()
+    }
+
+    public async find() {
+        // assertOptions({}, ['lookupDir'])
+    }
+}

package/src/__tests__/testDirsAndFiles/static_test_migration_2/src/__tests__/AnotherStaticTest1.test.ts

@@ -0,0 +1,33 @@
+import { fake } from '@sprucelabs/spruce-test-fixtures'
+import AbstractSpruceTest, {
+    test,
+    assert,
+    errorAssert,
+} from '@sprucelabs/test-utils'
+
+@fake.login()
+export default class StaticTestFinderTest extends AbstractSpruceTest {
+    @test()
+    protected static async throwsWithMissing() {
+        const finder = StaticTestFinder.Finder()
+        const err = await assert.doesThrowAsync(() => finder.find())
+        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
+            parameters: ['lookupDir'],
+        })
+    }
+
+    @test()
+    protected static async yourNextTest() {
+        assert.isTrue(false)
+    }
+}
+
+class StaticTestFinder {
+    public static Finder() {
+        return new this()
+    }
+
+    public async find() {
+        // assertOptions({}, ['lookupDir'])
+    }
+}

package/src/__tests__/testDirsAndFiles/static_test_migration_3/src/__tests__/AStaticTest2.test.ts

@@ -0,0 +1,17 @@
+import { fake } from "@sprucelabs/spruce-test-fixtures";
+import {
+  test,
+  assert,
+} from "@sprucelabs/test-utils";
+import AbstractWhateverTest from "./AbstractWhateverTest";
+
+@fake.login()
+export default class StaticTestFinderTest extends AbstractWhateverTest {
+  @test()
+  protected static async throwsWithMissing() {}
+
+  @test()
+  protected static async yourNextTest() {
+    assert.isTrue(false);
+  }
+}

package/src/__tests__/testDirsAndFiles/static_test_migration_3/src/__tests__/AbstractWhateverTest.ts

@@ -0,0 +1,3 @@
+import AbstractSpruceTest from "@sprucelabs/test-utils";
+
+export default abstract class AbstractWhateverTest extends AbstractSpruceTest {}

package/src/boot.ts

@@ -7,7 +7,7 @@ import { CLI_HERO } from './constants'
 import { FeatureInstallerImpl } from './features/FeatureInstaller'
 import InFlightEntertainment from './InFlightEntertainment'
 import TerminalInterface from './interfaces/TerminalInterface'
-import CommandService from './services/CommandService'
+import CommandServiceImpl from './services/CommandService'
 
 export async function run(argv: string[] = []): Promise<void> {
     const program = new Command()
@@ -73,7 +73,7 @@ async function setupInFlightEntertainment(ui: TerminalInterface) {
         TerminalInterface.doesSupportColor() &&
         process.env.ENABLE_INSTALL_ENTERTAINMENT !== 'false'
     ) {
-        const command = new CommandService(
+        const command = new CommandServiceImpl(
             diskUtil.resolvePath(__dirname, '../')
         )
         InFlightEntertainment.setup({ command, ui })

package/src/features/skill/actions/BootAction.ts

@@ -1,7 +1,7 @@
 import { SpruceSchemas } from '#spruce/schemas/schemas.types'
 import bootSkillOptionsSchema from '#spruce/schemas/spruceCli/v2020_07_22/bootSkillOptions.schema'
 import SpruceError from '../../../errors/SpruceError'
-import CommandService from '../../../services/CommandService'
+import CommandServiceImpl from '../../../services/CommandService'
 import AbstractAction from '../../AbstractAction'
 import { FeatureActionResponse } from '../../features.types'
 
@@ -64,7 +64,7 @@ export default class BootAction extends AbstractAction<OptionsSchema> {
     }
 
     private async boot(
-        command: CommandService,
+        command: CommandServiceImpl,
         script: string,
         resolve: (value: unknown) => void,
         reject: (reason?: any) => void

package/src/features/test/TestRunner.ts

@@ -7,19 +7,19 @@ import {
 import { buildSchema } from '@sprucelabs/schema'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import SpruceError from '../../errors/SpruceError'
-import CommandService from '../../services/CommandService'
+import CommandServiceImpl from '../../services/CommandService'
 import JestJsonParser from '../../tests/JestJsonParser'
 import { SpruceTestResults } from './test.types'
 
 export default class TestRunner extends AbstractEventEmitter<TestRunnerContract> {
     private cwd: string
-    private commandService: CommandService
+    private commandService: CommandServiceImpl
     private wasKilled = false
     private testResults: SpruceTestResults = { totalTestFiles: 0 }
 
     public constructor(options: {
         cwd: string
-        commandService: CommandService
+        commandService: CommandServiceImpl
     }) {
         super(testRunnerContract)
         this.cwd = options.cwd

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

@@ -1,4 +1,5 @@
 import pathUtil from 'path'
+import globby from '@sprucelabs/globby'
 import { namesUtil } from '@sprucelabs/spruce-skill-utils'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { SpruceSchemas } from '#spruce/schemas/schemas.types'
@@ -51,6 +52,9 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
             'devDependencies.@sprucelabs/spruce-test-fixtures'
         )
 
+        let doesStaticTestExist =
+            await this.doesStaticTestAlreadyExist(resolvedDestination)
+
         const results = await writer.writeTest(resolvedDestination, {
             ...normalizedOptions,
             type,
@@ -58,6 +62,7 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
             parentTestClass,
             isTestFixturesInstalled,
             namePascal: namePascal ?? namesUtil.toPascal(nameCamel),
+            testType: doesStaticTestExist ? 'static' : 'instance',
         })
 
         return {
@@ -66,6 +71,18 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
         }
     }
 
+    private async doesStaticTestAlreadyExist(resolvedDestination: string) {
+        const matches = await globby(resolvedDestination + `/**/*.test.ts`)
+        let doesStaticTestExist = false
+
+        const match = matches[0]
+        if (match) {
+            const contents = diskUtil.readFile(matches[0])
+            doesStaticTestExist = contents.includes('static')
+        }
+        return doesStaticTestExist
+    }
+
     private async promptForSubDir(resolvedDestination: string) {
         const match = await this.ui.prompt({
             type: 'directory',