From 99837f9752a81acfb2260b569f50c217dcc4be4b Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Thu, 31 Oct 2024 10:36:29 +0100 Subject: [PATCH] Fix integration tests (#8229) Removing leftovers of the deprecated "activity" object which is fixing our integration tests --- .../findActivityTargetsOperationSignatureFactory.ts | 2 -- .../suites/all-attachments-resolvers.integration-spec.ts | 5 ----- .../suites/all-note-targets-resolvers.integration-spec.ts | 4 ++-- .../suites/all-task-targets-resolvers.integration-spec.ts | 4 ++-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/findActivityTargetsOperationSignatureFactory.ts b/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/findActivityTargetsOperationSignatureFactory.ts index f71407866..b9e18aaf4 100644 --- a/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/findActivityTargetsOperationSignatureFactory.ts +++ b/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/findActivityTargetsOperationSignatureFactory.ts @@ -19,8 +19,6 @@ export const findActivityTargetsOperationSignatureFactory: RecordGqlOperationSig __typename: true, createdAt: true, updatedAt: true, - activity: true, - activityId: true, ...generateActivityTargetMorphFieldKeys(objectMetadataItems), }, }); diff --git a/packages/twenty-server/test/integration/graphql/suites/all-attachments-resolvers.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/all-attachments-resolvers.integration-spec.ts index c8113b112..8bfd572d4 100644 --- a/packages/twenty-server/test/integration/graphql/suites/all-attachments-resolvers.integration-spec.ts +++ b/packages/twenty-server/test/integration/graphql/suites/all-attachments-resolvers.integration-spec.ts @@ -25,7 +25,6 @@ const ATTACHMENT_GQL_FIELDS = ` updatedAt deletedAt authorId - activityId taskId noteId personId @@ -70,7 +69,6 @@ describe('attachments resolvers (integration)', () => { expect(attachment).toHaveProperty('updatedAt'); expect(attachment).toHaveProperty('deletedAt'); expect(attachment).toHaveProperty('authorId'); - expect(attachment).toHaveProperty('activityId'); expect(attachment).toHaveProperty('taskId'); expect(attachment).toHaveProperty('noteId'); expect(attachment).toHaveProperty('personId'); @@ -104,7 +102,6 @@ describe('attachments resolvers (integration)', () => { expect(createdAttachment).toHaveProperty('updatedAt'); expect(createdAttachment).toHaveProperty('deletedAt'); expect(createdAttachment).toHaveProperty('authorId'); - expect(createdAttachment).toHaveProperty('activityId'); expect(createdAttachment).toHaveProperty('taskId'); expect(createdAttachment).toHaveProperty('noteId'); expect(createdAttachment).toHaveProperty('personId'); @@ -137,7 +134,6 @@ describe('attachments resolvers (integration)', () => { expect(attachments).toHaveProperty('updatedAt'); expect(attachments).toHaveProperty('deletedAt'); expect(attachments).toHaveProperty('authorId'); - expect(attachments).toHaveProperty('activityId'); expect(attachments).toHaveProperty('taskId'); expect(attachments).toHaveProperty('noteId'); expect(attachments).toHaveProperty('personId'); @@ -169,7 +165,6 @@ describe('attachments resolvers (integration)', () => { expect(attachment).toHaveProperty('updatedAt'); expect(attachment).toHaveProperty('deletedAt'); expect(attachment).toHaveProperty('authorId'); - expect(attachment).toHaveProperty('activityId'); expect(attachment).toHaveProperty('taskId'); expect(attachment).toHaveProperty('noteId'); expect(attachment).toHaveProperty('personId'); diff --git a/packages/twenty-server/test/integration/graphql/suites/all-note-targets-resolvers.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/all-note-targets-resolvers.integration-spec.ts index 9b4d9fa0a..27faccfe6 100644 --- a/packages/twenty-server/test/integration/graphql/suites/all-note-targets-resolvers.integration-spec.ts +++ b/packages/twenty-server/test/integration/graphql/suites/all-note-targets-resolvers.integration-spec.ts @@ -14,8 +14,8 @@ import { generateRecordName } from 'test/integration/utils/generate-record-name' const NOTE_TARGET_1_ID = '777a8457-eb2d-40ac-a707-551b615b6987'; const NOTE_TARGET_2_ID = '777a8457-eb2d-40ac-a707-551b615b6988'; const NOTE_TARGET_3_ID = '777a8457-eb2d-40ac-a707-551b615b6989'; -const PERSON_1_ID = '777a8457-eb2d-40ac-a707-441b615b6989'; -const PERSON_2_ID = '777a8457-eb2d-40ac-a707-331b615b6989'; +const PERSON_1_ID = 'f875ff46-b881-41ba-973a-b9cd5345e8f0'; +const PERSON_2_ID = '1fe0f78c-8c59-4ce6-ae02-56571331b252'; const NOTE_TARGET_GQL_FIELDS = ` id createdAt diff --git a/packages/twenty-server/test/integration/graphql/suites/all-task-targets-resolvers.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/all-task-targets-resolvers.integration-spec.ts index 9cf1b93f4..b50f16fc6 100644 --- a/packages/twenty-server/test/integration/graphql/suites/all-task-targets-resolvers.integration-spec.ts +++ b/packages/twenty-server/test/integration/graphql/suites/all-task-targets-resolvers.integration-spec.ts @@ -14,8 +14,8 @@ import { generateRecordName } from 'test/integration/utils/generate-record-name' const TASK_TARGET_1_ID = '777a8457-eb2d-40ac-a707-551b615b6987'; const TASK_TARGET_2_ID = '777a8457-eb2d-40ac-a707-551b615b6988'; const TASK_TARGET_3_ID = '777a8457-eb2d-40ac-a707-551b615b6989'; -const PERSON_1_ID = '777a8457-eb2d-40ac-a707-441b615b6989'; -const PERSON_2_ID = '777a8457-eb2d-40ac-a707-331b615b6989'; +const PERSON_1_ID = 'f875ff46-b881-41ba-973a-b9cd5345e8f0'; +const PERSON_2_ID = '1fe0f78c-8c59-4ce6-ae02-56571331b252'; const TASK_TARGET_GQL_FIELDS = ` id createdAt