Skip to content

The open alternative to Salesforce, designed for AI.

Fix e2e tests hidden behind the revoked shared session (#26719)

Félix Malfaitee00a59e0e65
diff --git a/packages/twenty-e2e-testing/.env.example b/packages/twenty-e2e-testing/.env.example
index 9a2f4ff9d35..628157c42b8 100644
--- a/packages/twenty-e2e-testing/.env.example
+++ b/packages/twenty-e2e-testing/.env.example
@@ -1,6 +1,5 @@
# Note that provide always without trailing forward slash to have expected behaviour
FRONTEND_BASE_URL=http://localhost:3001
-BACKEND_BASE_URL=http://localhost:3000
WEBSITE_URL=https://twenty.com
diff --git a/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts b/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
index 3f02a2a1536..b65574f2361 100644
--- a/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
+++ b/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
@@ -97,16 +97,16 @@ export class WorkflowVisualizerPage {
async createOneWorkflow() {
const id = randomUUID();
+ await this.#page.goto('/');
+
const response = await createWorkflow({
page: this.#page,
workflowId: id,
workflowName: this.workflowName,
});
- expect(response.status()).toBe(200);
-
- const responseBody = await response.json();
- expect(responseBody.data.createWorkflow.id).toBe(id);
+ expect(response.status).toBe(200);
+ expect(response.body.data?.createWorkflow.id).toBe(id);
this.workflowId = id;
}
diff --git a/packages/twenty-e2e-testing/lib/requests/backend.ts b/packages/twenty-e2e-testing/lib/requests/backend.ts
deleted file mode 100644
index f1094013ff6..00000000000
--- a/packages/twenty-e2e-testing/lib/requests/backend.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const backendGraphQLUrl = new URL(
- '/graphql',
- process.env.BACKEND_BASE_URL,
-).toString();
-
-// Mirrors the baseURL default in playwright.config.ts.
-export const frontendOrigin = new URL(
- process.env.FRONTEND_BASE_URL || 'http://localhost:3001',
-).origin;
diff --git a/packages/twenty-e2e-testing/lib/requests/create-workflow.ts b/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
index 17ab61ad35b..45ff290f58f 100644
--- a/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
+++ b/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
@@ -10,7 +10,7 @@ export const createWorkflow = async ({
workflowId: string;
workflowName: string;
}) => {
- return postBackendGraphQL({
+ return postBackendGraphQL<{ createWorkflow: { id: string } }>({
page,
data: {
operationName: 'CreateOneWorkflow',
diff --git a/packages/twenty-e2e-testing/lib/requests/post-backend-graphql.ts b/packages/twenty-e2e-testing/lib/requests/post-backend-graphql.ts
index 849298f81f6..bf364b76cf6 100644
--- a/packages/twenty-e2e-testing/lib/requests/post-backend-graphql.ts
+++ b/packages/twenty-e2e-testing/lib/requests/post-backend-graphql.ts
@@ -1,20 +1,38 @@
-import { type APIResponse, type Page } from '@playwright/test';
-import { backendGraphQLUrl, frontendOrigin } from './backend';
+import { type Page } from '@playwright/test';
-// Authenticates by session cookie: page.request shares the browser context's
-// cookie jar, which is the only place an httpOnly session cookie exists.
-// CookieSessionCsrfMiddleware fails closed on a missing Origin for a
-// cookie-authenticated write, and page.request sends none on its own.
-export const postBackendGraphQL = ({
+export type BackendGraphQLResponse<TData> = {
+ status: number;
+ body: {
+ data?: TData;
+ errors?: { message: string }[];
+ };
+};
+
+type WindowWithTwentyEnv = Window & {
+ _env_?: { REACT_APP_SERVER_BASE_URL?: string };
+};
+
+// Sent from inside the page so it carries the same workspace origin and
+// session cookie as the app's own requests. The cookie is scoped to the
+// workspace subdomain, which Node-side requests can neither resolve nor reach.
+export const postBackendGraphQL = <TData>({
page,
data,
}: {
page: Page;
data: Record<string, unknown>;
-}): Promise<APIResponse> =>
- page.request.post(backendGraphQLUrl, {
- headers: {
- Origin: frontendOrigin,
- },
- data,
- });
+}): Promise<BackendGraphQLResponse<TData>> =>
+ page.evaluate(async (requestBody): Promise<BackendGraphQLResponse<TData>> => {
+ const serverBaseUrl =
+ (window as WindowWithTwentyEnv)._env_?.REACT_APP_SERVER_BASE_URL ||
+ window.location.origin;
+
+ const response = await fetch(`${serverBaseUrl}/graphql`, {
+ method: 'POST',
+ credentials: 'include',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(requestBody),
+ });
+
+ return { status: response.status, body: await response.json() };
+ }, data);
diff --git a/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts b/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts
index 6f218dddc05..4f9f16fc2f0 100644
--- a/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts
+++ b/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts
@@ -7,8 +7,8 @@ test('Create Industry Select Field', async ({ page }) => {
await page.getByRole('button', { name: 'Settings', exact: true }).click();
await page.getByRole('link', { name: 'Data model' }).click();
await page.getByRole('link', { name: 'Opportunities' }).click();
- await expect(page.getByRole('button', { name: 'New Field' })).toBeVisible();
- await page.getByRole('button', { name: 'New Field' }).click();
+ await expect(page.getByRole('link', { name: 'New Field' })).toBeVisible();
+ await page.getByRole('link', { name: 'New Field' }).click();
await page.getByRole('link', { name: 'Select', exact: true }).click();
await page.getByRole('textbox', { name: 'Employees' }).click();
await page.getByRole('textbox', { name: 'Employees' }).fill(industryLabel);
@@ -38,7 +38,10 @@ test('Create Kanban View from Industry Select Field', async ({ page }) => {
.locator('xpath=..')
.getByRole('button')
.click();
- await page.getByRole('button', { name: industryLabel }).click();
+ await page
+ .getByRole('dialog', { name: 'Stages' })
+ .getByRole('button', { name: industryLabel })
+ .click();
await page.getByRole('button', { name: 'Create new view' }).click();
await expect(page.getByText('Food')).toBeVisible({ timeout: 30000 });
await expect(page.getByText('Tech')).toBeVisible();
diff --git a/packages/twenty-e2e-testing/tests/create-record.spec.ts b/packages/twenty-e2e-testing/tests/create-record.spec.ts
index 984883b1f5e..f79e1c2b67e 100644
--- a/packages/twenty-e2e-testing/tests/create-record.spec.ts
+++ b/packages/twenty-e2e-testing/tests/create-record.spec.ts
@@ -1,6 +1,17 @@
import { expect, test } from '../lib/fixtures/screenshot';
import { postBackendGraphQL } from '../lib/requests/post-backend-graphql';
+type FindOnePersonData = {
+ person: {
+ name: { firstName: string; lastName: string };
+ emails: { primaryEmail: string };
+ intro: string;
+ linkedinLink: { primaryLinkUrl: string };
+ phones: { primaryPhoneNumber: string };
+ workPreference: string[];
+ };
+};
+
const query = `query FindOnePerson($objectRecordId: UUID!) {
person(
filter: {or: [{deletedAt: {is: NULL}}, {deletedAt: {is: NOT_NULL}}], id: {eq: $objectRecordId}}
@@ -147,7 +158,7 @@ test('Create and update record', async ({ page }) => {
const newPersonId = page.url().match(/\/object\/person\/([a-f0-9-]+)/)?.[1];
// Check data was saved
- const findOnePersonResponse = await postBackendGraphQL({
+ const findOnePersonResponse = await postBackendGraphQL<FindOnePersonData>({
page,
data: {
operationName: 'FindOnePerson',
@@ -158,21 +169,14 @@ test('Create and update record', async ({ page }) => {
},
});
- const findOnePersonReponseBody = await findOnePersonResponse.json();
-
- expect(findOnePersonReponseBody.data.person.name.firstName).toBe('John');
- expect(findOnePersonReponseBody.data.person.name.lastName).toBe('Doe');
- expect(findOnePersonReponseBody.data.person.emails.primaryEmail).toBe(
- randomEmail,
- );
- expect(findOnePersonReponseBody.data.person.intro).toBe('This is an intro');
- expect(findOnePersonReponseBody.data.person.linkedinLink.primaryLinkUrl).toBe(
- 'linkedin.com/johndoe',
- );
- expect(findOnePersonReponseBody.data.person.phones.primaryPhoneNumber).toBe(
- '611223344',
- );
- expect(findOnePersonReponseBody.data.person.workPreference).toEqual([
- 'HYBRID',
- ]);
+ expect(findOnePersonResponse.status).toBe(200);
+ expect(findOnePersonResponse.body.errors).toBeUndefined();
+ expect(findOnePersonResponse.body.data?.person).toMatchObject({
+ name: { firstName: 'John', lastName: 'Doe' },
+ emails: { primaryEmail: randomEmail },
+ intro: 'This is an intro',
+ linkedinLink: { primaryLinkUrl: 'linkedin.com/johndoe' },
+ phones: { primaryPhoneNumber: '611223344' },
+ workPreference: ['HYBRID'],
+ });
});
diff --git a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
index e3d27450af2..7626c26d2a7 100644
--- a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
+++ b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
@@ -13,9 +13,12 @@ test('Create workflow', async ({ page }) => {
const workflowsLink = page.getByRole('link', { name: 'Workflows' });
await workflowsLink.click();
- const createWorkflowButton = page.getByRole('button', {
- name: 'Create Workflow',
- });
+ await page.getByRole('button', { name: 'Create Workflow' }).click();
+
+ const recordCreationForm = page.getByRole('complementary');
+ await recordCreationForm
+ .getByRole('textbox', { name: 'Name' })
+ .fill(NEW_WORKFLOW_NAME);
const [createWorkflowResponse] = await Promise.all([
page.waitForResponse(async (response) => {
@@ -28,17 +31,9 @@ test('Create workflow', async ({ page }) => {
return requestBody.operationName === 'CreateOneWorkflow';
}),
- createWorkflowButton.click()
+ recordCreationForm.getByRole('button', { name: 'Create' }).click(),
]);
-
- const recordName = page.getByTestId('top-bar-title').getByPlaceholder('Name');
- await expect(recordName).toBeVisible();
- await recordName.fill(NEW_WORKFLOW_NAME);
-
- const workflowDiagramContainer = page.locator('.react-flow__renderer');
- await workflowDiagramContainer.click();
-
const body = await createWorkflowResponse.json();
const newWorkflowId = body.data.createWorkflow.id;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx
index 2e107136355..6cca71275d9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx
@@ -36,12 +36,14 @@ export const FormTextFieldInput = ({
VariablePicker,
}: FormTextFieldInputProps) => {
const instanceId = useId();
+ const labelId = `${instanceId}-label`;
const editor = useTextVariableEditor({
placeholder: placeholder ?? t`Enter text`,
multiline,
readonly,
defaultValue,
+ ariaLabelledBy: label ? labelId : undefined,
onUpdate: (editor) => {
const jsonContent = editor.getJSON();
const parsedContent = parseEditorContent(jsonContent);
@@ -66,7 +68,7 @@ export const FormTextFieldInput = ({
return (
<FormFieldInputContainer>
- {label ? <Field.Label>{label}</Field.Label> : null}
+ {label ? <Field.Label id={labelId}>{label}</Field.Label> : null}
<FormFieldInputRowContainer multiline={multiline}>
<FormFieldInputInnerContainer
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
index a11253a9291..d615c3f4f52 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
@@ -39,6 +39,8 @@ export const WithLabel: Story = {
const canvas = within(canvasElement);
await canvas.findByText(/^Text$/);
+
+ expect(await canvas.findByRole('textbox', { name: 'Text' })).toBeVisible();
},
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
index 89b6827f616..f87a15b0ace 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
@@ -19,6 +19,7 @@ type UseTextVariableEditorProps = {
readonly: boolean | undefined;
defaultValue: string | undefined | null;
onUpdate: (editor: Editor) => void;
+ ariaLabelledBy?: string;
};
/**
@@ -39,6 +40,7 @@ export const useTextVariableEditor = ({
readonly,
defaultValue,
onUpdate,
+ ariaLabelledBy,
}: UseTextVariableEditorProps) => {
const editor = useEditor({
extensions: [
@@ -66,6 +68,14 @@ export const useTextVariableEditor = ({
onUpdate(editor);
},
editorProps: {
+ // Re-applied props replace Tiptap's default attributes, so the role
+ // has to be restated here or the editor loses it.
+ attributes: {
+ role: 'textbox',
+ ...(isDefined(ariaLabelledBy)
+ ? { 'aria-labelledby': ariaLabelledBy }
+ : {}),
+ },
handleKeyDown: (view, event) => {
if (event.key === 'Enter' && !event.shiftKey) {
event.preventDefault();