Fix tests

Author: martmull

packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__e2e__/applications-install-delete-reinstall.e2e-spec.ts

@@ -1,14 +1,15 @@
 import { getTestedApplicationPath } from '@/cli/__tests__/e2e/utils/get-tested-application-path.util';
-import { AppSyncCommand } from '@/cli/commands/app/app-sync';
 import { AppUninstallCommand } from '@/cli/commands/app/app-uninstall';
 import { existsSync } from 'fs';
 import { inspect } from 'util';
+import { AppDevCommand } from '@/cli/commands/app/app-dev';
+import { join } from 'path';
 
 inspect.defaultOptions.depth = 10;
 
 describe('Application: install delete and reinstall rich-app', () => {
   const applicationName = 'rich-app';
-  const syncCommand = new AppSyncCommand();
+  const appDevCommand = new AppDevCommand();
   const deleteCommand = new AppUninstallCommand();
   const appPath = getTestedApplicationPath(applicationName);
 
@@ -26,9 +27,9 @@ describe('Application: install delete and reinstall rich-app', () => {
   });
 
   it(`should successfully install ${applicationName} application`, async () => {
-    const result = await syncCommand.execute(appPath);
+    await appDevCommand.execute({ appPath });
 
-    expect(result.success).toBe(true);
+    expect(existsSync(join(appPath, 'manifest.json'))).toBe(true);
   });
 
   it(`should successfully delete ${applicationName} application`, async () => {
@@ -41,8 +42,8 @@ describe('Application: install delete and reinstall rich-app', () => {
   });
 
   it(`should successfully re-install ${applicationName} application`, async () => {
-    const result = await syncCommand.execute(appPath);
+    await appDevCommand.execute({ appPath });
 
-    expect(result.success).toBe(true);
+    expect(existsSync(join(appPath, 'manifest.json'))).toBe(true);
   });
 });

packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-build/app-build.integration.spec.ts

@@ -14,34 +14,23 @@ export const defineConsoleOutputTests = (
       expect(output).toContain('[init] 📁 App Path:');
     });
 
-    it('should contain manifest-watch messages', () => {
-      const output = getOutputByPrefix(getResult().output, 'manifest-watch');
-
-      expect(output).toContain('[manifest-watch] 🔄 Building...');
-      expect(output).toContain('[manifest-watch] ✓ Loaded "Hello World"');
-      expect(output).toContain('[manifest-watch] ✓ Found 2 object(s)');
-      expect(output).toContain('[manifest-watch] ✓ Found 4 function(s)');
-      expect(output).toContain('[manifest-watch] ✓ Found 4 front component(s)');
-      expect(output).toContain('[manifest-watch] ✓ Found 2 role(s)');
-      expect(output).toContain('[manifest-watch] ✓ Written to');
-      expect(output).toContain('[manifest-watch] 📂 Watcher started');
+    it('should contain dev-mode build messages', () => {
+      const output = getOutputByPrefix(getResult().output, 'dev-mode');
+
+      expect(output).toContain('[dev-mode] Building manifest...');
+      expect(output).toContain('[dev-mode] Successfully built manifest');
     });
 
-    it('should contain functions-watch messages', () => {
-      const output = getOutputByPrefix(getResult().output, 'functions-watch');
+    it('should contain dev-mode function build messages', () => {
+      const output = getOutputByPrefix(getResult().output, 'dev-mode');
 
-      expect(output).toContain('[functions-watch] 📦 Building...');
-      expect(output).toContain('[functions-watch] ✓ Built');
+      expect(output).toContain('[dev-mode] ✓ Successfully built');
     });
 
-    it('should contain front-components-watch messages', () => {
-      const output = getOutputByPrefix(
-        getResult().output,
-        'front-components-watch',
-      );
+    it('should contain dev-mode sync messages', () => {
+      const output = getOutputByPrefix(getResult().output, 'dev-mode');
 
-      expect(output).toContain('[front-components-watch] 🎨 Building...');
-      expect(output).toContain('[front-components-watch] ✓ Built');
+      expect(output).toContain('[dev-mode] ✓ Synced');
     });
   });
 };

packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-build/tests/console-output.tests.ts

@@ -1,7 +1,4 @@
 export const testFunction2 = () => {
-  const Twenty = require('../../generated').default;
-
-  const client = new Twenty();
-
-  return client.query('testQuery');
+  // This is a test utility function for integration tests
+  return 'test-function-2-result';
 };

packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/tests/console-output.tests.ts

@@ -86,7 +86,7 @@ export const EXPECTED_MANIFEST: ApplicationManifest = {
       ],
       handlerName: 'myHandler',
       sourceHandlerPath: 'my.function.ts',
-      builtHandlerPath: 'functions/my.function.mjs',
+      builtHandlerPath: 'my.function.mjs',
       builtHandlerChecksum: '[checksum]',
     },
   ],
@@ -97,7 +97,7 @@ export const EXPECTED_MANIFEST: ApplicationManifest = {
       description: 'A root-level front component',
       componentName: 'MyComponent',
       sourceComponentPath: 'my.front-component.tsx',
-      builtComponentPath: 'front-components/my.front-component.mjs',
+      builtComponentPath: 'my.front-component.mjs',
       builtComponentChecksum: '[checksum]',
     },
   ],

packages/twenty-sdk/src/cli/__tests__/apps/rich-app/src/utils/test-function-2.util.ts

@@ -14,34 +14,23 @@ export const defineConsoleOutputTests = (
       expect(output).toContain('[init] 📁 App Path:');
     });
 
-    it('should contain manifest-watch messages', () => {
-      const output = getOutputByPrefix(getResult().output, 'manifest-watch');
-
-      expect(output).toContain('[manifest-watch] 🔄 Building...');
-      expect(output).toContain('[manifest-watch] ✓ Loaded "Root App"');
-      expect(output).toContain('[manifest-watch] ✓ Found 1 object(s)');
-      expect(output).toContain('[manifest-watch] ✓ Found 1 function(s)');
-      expect(output).toContain('[manifest-watch] ✓ Found 1 front component(s)');
-      expect(output).toContain('[manifest-watch] ✓ Found 1 role(s)');
-      expect(output).toContain('[manifest-watch] ✓ Written to');
-      expect(output).toContain('[manifest-watch] 📂 Watcher started');
+    it('should contain dev-mode build messages', () => {
+      const output = getOutputByPrefix(getResult().output, 'dev-mode');
+
+      expect(output).toContain('[dev-mode] Building manifest...');
+      expect(output).toContain('[dev-mode] Successfully built manifest');
     });
 
-    it('should contain functions-watch messages', () => {
-      const output = getOutputByPrefix(getResult().output, 'functions-watch');
+    it('should contain dev-mode function build messages', () => {
+      const output = getOutputByPrefix(getResult().output, 'dev-mode');
 
-      expect(output).toContain('[functions-watch] 📦 Building...');
-      expect(output).toContain('[functions-watch] ✓ Built');
+      expect(output).toContain('[dev-mode] ✓ Successfully built');
     });
 
-    it('should contain front-components-watch messages', () => {
-      const output = getOutputByPrefix(
-        getResult().output,
-        'front-components-watch',
-      );
+    it('should contain dev-mode sync messages', () => {
+      const output = getOutputByPrefix(getResult().output, 'dev-mode');
 
-      expect(output).toContain('[front-components-watch] 🎨 Building...');
-      expect(output).toContain('[front-components-watch] ✓ Built');
+      expect(output).toContain('[dev-mode] ✓ Synced');
     });
   });
 };

packages/twenty-sdk/src/cli/__tests__/apps/root-app/__integration__/app-build/app-build.integration.spec.ts

@@ -4,14 +4,14 @@ import { join } from 'path';
 export const defineFrontComponentsTests = (appPath: string): void => {
   describe('front-components', () => {
     it('should have built front components at root level', async () => {
-      const frontComponentsDir = join(
-        appPath,
-        '.twenty/output/front-components',
-      );
-      const files = await fs.readdir(frontComponentsDir, { recursive: true });
-      const sortedFiles = files.map((f) => f.toString()).sort();
+      const outputDir = join(appPath, '.twenty/output');
+      const files = await fs.readdir(outputDir, { recursive: true });
+      const componentFiles = files
+        .map((f) => f.toString())
+        .filter((f) => f.includes('.front-component.'))
+        .sort();
 
-      expect(sortedFiles).toEqual([
+      expect(componentFiles).toEqual([
         'my.front-component.mjs',
         'my.front-component.mjs.map',
       ]);