Fix

twentyhq · Oct 4, 2024 · 77272ff · 77272ff
1 parent fc3e784
commit 77272ff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 68 deletions.
diff --git a/packages/twenty-server/jest-integration.config.ts b/packages/twenty-server/jest-integration.config.ts
@@ -10,10 +10,7 @@ const jestConfig: JestConfigWithTsJest = {
   rootDir: '.',
   testEnvironment: 'node',
   testRegex: '.integration-spec.ts$',
-  modulePathIgnorePatterns: [
-    '<rootDir>/dist',
-    '<rootDir>/../twenty-emails/dist',
-  ],
+  modulePathIgnorePatterns: ['<rootDir>/dist'],
   globalSetup: '<rootDir>/test/utils/setup-test.ts',
   globalTeardown: '<rootDir>/test/utils/teardown-test.ts',
   testTimeout: 15000,

diff --git a/packages/twenty-server/src/constants/assets-path.ts b/packages/twenty-server/src/constants/assets-path.ts
@@ -1,3 +1,6 @@
 import path from 'path';
 
-export const ASSET_PATH = path.resolve(__dirname, `../../assets`);
+export const ASSET_PATH =
+  process.env.NODE_ENV === 'test'
+    ? path.resolve(__dirname, `../../dist/assets`)
+    : path.resolve(__dirname, `../../assets`);
diff --git a/...ver/src/engine/core-modules/serverless/drivers/utils/get-base-typescript-project-files.ts b/...ver/src/engine/core-modules/serverless/drivers/utils/get-base-typescript-project-files.ts
@@ -1,5 +1,5 @@
-import path, { join } from 'path';
 import fs from 'fs/promises';
+import path, { join } from 'path';
 
 import { ASSET_PATH } from 'src/constants/assets-path';
 

diff --git a/packages/twenty-server/test/serverless-functions.integration-spec.ts b/packages/twenty-server/test/serverless-functions.integration-spec.ts
diff --git a/packages/twenty-server/test/utils/setup-test.ts b/packages/twenty-server/test/utils/setup-test.ts
@@ -1,5 +1,5 @@
-import 'tsconfig-paths/register';
 import { JestConfigWithTsJest } from 'ts-jest';
+import 'tsconfig-paths/register';
 
 import { createApp } from './create-app';