fix: Fixed most tests

Author: kevinwang5658

src/orchestrators/destroy.ts

@@ -69,7 +69,9 @@ export class DestroyOrchestrator {
       pluginManager.apply(uninstallProject, filteredPlan)
     )
 
-    await reporter.displayApplyComplete([]);
+    await reporter.displayMessage(`
+🎉 Finished applying 🎉
+Open a new terminal or source '.zshrc' for the new changes to be reflected`);
   }
 
   private static async validate(project: Project, pluginManager: PluginManager, dependencyMap: DependencyMap): Promise<void> {

src/orchestrators/import.ts

@@ -66,7 +66,7 @@ export class ImportOrchestrator {
   }
 
   /** Import new resources. Type ids supplied. This will ask for any required parameters */
-  static async runNewImport(typeIds: string[], reporter: Reporter, initializeResult: InitializationResult): Promise<ResourceConfig[]> {
+  static async runNewImport(typeIds: string[], reporter: Reporter, initializeResult: InitializationResult): Promise<void> {
     const { project, pluginManager, typeIdsToDependenciesMap } = initializeResult;
 
     const matchedTypes = this.matchTypeIds(typeIds, [...typeIdsToDependenciesMap.keys()])
@@ -87,7 +87,7 @@ export class ImportOrchestrator {
   }
 
   /** Update an existing project. This will use the existing resources as the parameters (no user input required). */
-  static async runExistingProject(reporter: Reporter, initializeResult: InitializationResult): Promise<ResourceConfig[]> {
+  static async runExistingProject(reporter: Reporter, initializeResult: InitializationResult): Promise<void> {
     const { pluginManager, project } = initializeResult;
 
     await pluginManager.validate(project);
@@ -106,8 +106,6 @@ export class ImportOrchestrator {
       resourceInfoList,
       project.codifyFiles[0],
     );
-
-    return project.resourceConfigs;
   }
 
   static async import(

src/ui/components/default-component.test.tsx

@@ -53,11 +53,4 @@ describe('DefaultComponent', () => {
 
     expect(lastFrame()).toContain('Password:');
   });
-
-  it('renders import parameter form when renderStatus is IMPORT_PROMPT', () => {
-    store.set(store.renderState, { status: RenderStatus.IMPORT_PROMPT, data: new Map() });
-    const { lastFrame } = render(<DefaultComponent emitter={emitter} />);
-
-    expect(lastFrame()).toContain('Mock Import Parameters Form');
-  });
 });

src/utils/file-modification-calculator.ts

@@ -90,8 +90,10 @@ export class FileModificationCalculator {
     newFile = this.insert(newFile, newResourcesToInsert, insertionIndex);
 
     const lastCharacterIndex = this.existingFile.contents.lastIndexOf(']')
-    const ending = this.existingFile.contents.slice(Math.min(lastCharacterIndex + 1, this.existingFile.contents.length - 1));
-    newFile += ending;
+    if (lastCharacterIndex < this.existingFile.contents.length - 1) {
+      const ending = this.existingFile.contents.slice(lastCharacterIndex + 1);
+      newFile += ending;
+    }
 
     return {
       newFile: newFile,

test/orchestrator/apply/apply.test.ts

@@ -32,7 +32,7 @@ describe('Apply orchestrator tests', () => {
     });
 
     const applyConfirmationSpy = vi.spyOn(reporter, 'promptConfirmation');
-    const applyCompleteSpy = vi.spyOn(reporter, 'displayApplyComplete');
+    const applyCompleteSpy = vi.spyOn(reporter, 'displayMessage');
 
     console.log(MockOs.get('xcode-tools'))
     expect(MockOs.get('mock')).to.be.undefined;
@@ -69,7 +69,7 @@ describe('Apply orchestrator tests', () => {
     });
 
     const applyConfirmationSpy = vi.spyOn(reporter, 'promptConfirmation');
-    const applyCompleteSpy = vi.spyOn(reporter, 'displayApplyComplete');
+    const applyCompleteSpy = vi.spyOn(reporter, 'displayMessage');
 
     MockOs.destroy('xcode-tools');
     expect(MockOs.get('xcode-tools')).to.be.undefined;

test/orchestrator/initialize/initialize.test.ts

@@ -68,7 +68,10 @@ describe('Parser integration tests', () => {
 
     console.log(project);
     expect(project).toMatchObject({
-      path: folder,
+      codifyFiles: expect.arrayContaining([
+        path.resolve(folder, 'home.codify.json'),
+        path.resolve(folder, 'home-2.codify.json')
+      ]),
       resourceConfigs: expect.arrayContaining([
         expect.objectContaining({
           type: 'customType1',
@@ -110,7 +113,10 @@ describe('Parser integration tests', () => {
 
     console.log(project);
     expect(project).toMatchObject({
-      path: folder,
+      codifyFiles: expect.arrayContaining([
+        path.resolve(folder, 'home.codify.json'),
+        path.resolve(folder, 'home-2.codify.json')
+      ]),
       resourceConfigs: expect.arrayContaining([
         expect.objectContaining({
           type: 'customType1',

test/orchestrator/mocks/reporter.ts

@@ -1,17 +1,22 @@
 import { SpawnStatus, SudoRequestData, SudoRequestResponseData } from 'codify-schemas';
 
 import { Plan } from '../../../src/entities/plan.js';
-import { ImportResult, RequiredParameters, UserSuppliedParameters } from '../../../src/orchestrators/import.js';
+import { ResourceConfig } from '../../../src/entities/resource-config.js';
+import { ResourceInfo } from '../../../src/entities/resource-info.js';
+import { ImportResult } from '../../../src/orchestrators/import.js';
 import { prettyFormatPlan } from '../../../src/ui/plan-pretty-printer.js';
-import { Reporter } from '../../../src/ui/reporters/reporter.js';
+import { PromptType, Reporter } from '../../../src/ui/reporters/reporter.js';
+import { FileModificationResult } from '../../../src/utils/file-modification-calculator.js';
 
 export interface MockReporterConfig {
   validatePlan?: (plan: Plan) => Promise<void> | void;
-  validateApplyComplete?: (message: string[]) => Promise<void> | void;
+  validateMessage?: (message: string) => Promise<void> | void;
   validateImport?: (result: ImportResult) => Promise<void> | void;
   promptApplyConfirmation?: () => boolean;
-  askRequiredParametersForImport?: (requiredParameters: RequiredParameters) => Promise<UserSuppliedParameters> | UserSuppliedParameters;
+  promptOptions?: (message: string, options: string[]) => string;
+  promptUserForValues?: (resourceInfo: ResourceInfo[]) => Promise<ResourceConfig[]> | ResourceConfig[];
   displayImportResult?: (importResult: ImportResult) => Promise<void> | void;
+  displayFileModifications?: (diff: { file: string; modification: FileModificationResult; }[]) => void,
 }
 
 export class MockReporter implements Reporter {
@@ -21,9 +26,17 @@ export class MockReporter implements Reporter {
     this.config = config ?? null;
   }
 
-  async displayApplyComplete(message: string[]): Promise<void> {
+  async promptOptions(message: string, options: string[]): Promise<string> {
+    return this.config?.promptOptions?.(message, options) ?? options[0];
+  }
+
+  async displayFileModifications(diff: { file: string; modification: FileModificationResult; }[]): Promise<void> {
+    this.config?.displayFileModifications?.(diff);
+  }
+
+  async displayMessage(message: string): Promise<void> {
     console.log(JSON.stringify(message, null, 2));
-    await this.config?.validateApplyComplete?.(message);
+    await this.config?.validateMessage?.(message);
   }
 
   async displayPlan(plan: Plan): Promise<void> {
@@ -42,18 +55,12 @@ export class MockReporter implements Reporter {
     }
   }
 
-  async promptUserForParameterValues(requiredParameters: RequiredParameters): Promise<UserSuppliedParameters> {
-    if (this.config?.askRequiredParametersForImport) {
-      return this.config.askRequiredParametersForImport(requiredParameters);
-    }
-
-    const result = new Map<string, Record<string, string>>();
-
-    for (const parameter of requiredParameters) {
-      result.set(parameter[0], Object.fromEntries(parameter[1].map((p) => [p, ''])))
+  async promptUserForValues(resourceInfo: ResourceInfo[], promptType: PromptType): Promise<ResourceConfig[]> {
+    if (this.config?.promptUserForValues) {
+      return this.config.promptUserForValues(resourceInfo);
     }
 
-    return result;
+    return resourceInfo.map((i) => new ResourceConfig({ type: i.type }))
   }
 
   displayImportResult(importResult: ImportResult): void {