admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(integration-tests): auth with multiworkspace and skip clickhouse … (#11630)

Browse Source 
…tests
This commit is contained in:
Antoine Moreaux
2025-04-17 16:49:57 +02:00
committed by GitHub
parent a7b75c61e8
commit 21c3edf8d6
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/twenty-server/jest-integration.config.ts
View File

@ -3,6 +3,7 @@ import { JestConfigWithTsJest, pathsToModuleNameMapper } from 'ts-jest';
import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface'; import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';
const isBillingEnabled = process.env.IS_BILLING_ENABLED === 'true'; const isBillingEnabled = process.env.IS_BILLING_ENABLED === 'true';
const isClickhouseEnabled = process.env.CLICKHOUSE_URL !== undefined;
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
const tsConfig = require('./tsconfig.json'); const tsConfig = require('./tsconfig.json');
@ -16,9 +17,11 @@ const jestConfig: JestConfigWithTsJest = {
moduleFileExtensions: ['js', 'json', 'ts'], moduleFileExtensions: ['js', 'json', 'ts'],
rootDir: '.', rootDir: '.',
testEnvironment: 'node', testEnvironment: 'node',
testRegex: isBillingEnabled testPathIgnorePatterns: [
? '\\.integration-spec\\.ts$' ...(isBillingEnabled ? [] : ['<rootDir>/test/integration/billing']),
: '^(?!.*billing).*\\.integration-spec\\.ts$', ...(isClickhouseEnabled ? [] : ['<rootDir>/test/integration/analytics']),
],
testRegex: '\\.integration-spec\\.ts$',
modulePathIgnorePatterns: ['<rootDir>/dist'], modulePathIgnorePatterns: ['<rootDir>/dist'],
globalSetup: '<rootDir>/test/integration/utils/setup-test.ts', globalSetup: '<rootDir>/test/integration/utils/setup-test.ts',
globalTeardown: '<rootDir>/test/integration/utils/teardown-test.ts', globalTeardown: '<rootDir>/test/integration/utils/teardown-test.ts',

1
packages/twenty-server/test/integration/analytics/suites/clickhouse-event-registration.integration-spec.ts
View File

@ -5,6 +5,7 @@ import { createClient, ClickHouseClient } from '@clickhouse/client';
import { GenericTrackEvent } from 'src/engine/core-modules/analytics/utils/events/track/track'; import { GenericTrackEvent } from 'src/engine/core-modules/analytics/utils/events/track/track';
import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/analytics/utils/events/track/object-record/object-record-created'; import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/analytics/utils/events/track/object-record/object-record-created';
describe('ClickHouse Event Registration (integration)', () => { describe('ClickHouse Event Registration (integration)', () => {
let clickhouseClient: ClickHouseClient; let clickhouseClient: ClickHouseClient;

11
packages/twenty-server/test/integration/graphql/suites/auth.integration-spec.ts
View File

@ -4,6 +4,13 @@ const SERVER_URL = `http://localhost:${APP_PORT}`;
const client = request(SERVER_URL); const client = request(SERVER_URL);
const ORIGIN = new URL(SERVER_URL);
ORIGIN.hostname =
process.env.IS_MULTIWORKSPACE_ENABLED === 'true'
? `acme.${ORIGIN.hostname}`
: ORIGIN.hostname;
const auth = { const auth = {
email: 'tim@apple.dev', email: 'tim@apple.dev',
password: 'Applecar2025', password: 'Applecar2025',
@ -28,7 +35,7 @@ describe('AuthResolve (integration)', () => {
return client return client
.post('/graphql') .post('/graphql')
.set('Origin', SERVER_URL) .set('Origin', ORIGIN.toString())
.send(queryData) .send(queryData)
.expect(200) .expect(200)
.expect((res) => { .expect((res) => {
@ -62,7 +69,7 @@ describe('AuthResolve (integration)', () => {
return client return client
.post('/graphql') .post('/graphql')
.set('Origin', SERVER_URL) .set('Origin', ORIGIN.toString())
.send(queryData) .send(queryData)
.expect(200) .expect(200)
.expect((res) => { .expect((res) => {