diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml index eb5479e959..087eb168ec 100644 --- a/.github/workflows/ci-front.yaml +++ b/.github/workflows/ci-front.yaml @@ -7,6 +7,8 @@ on: pull_request: + merge_group: + permissions: contents: read @@ -130,7 +132,7 @@ jobs: run: npx nx storybook:coverage twenty-front --checkCoverage=true --configuration=${{ matrix.storybook_scope }} front-chromatic-deployment: timeout-minutes: 30 - if: contains(github.event.pull_request.labels.*.name, 'run-chromatic') || github.event_name == 'push' + if: false needs: front-sb-build runs-on: depot-ubuntu-24.04-8 env: @@ -229,7 +231,7 @@ jobs: always() && needs.changed-files-check-e2e.outputs.any_changed == 'true' && (needs.front-build.result == 'success' || needs.front-build.result == 'skipped') && - (github.event_name == 'push' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-e2e'))) + (github.event_name == 'push' || github.event_name == 'merge_group' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-e2e'))) timeout-minutes: 30 env: NODE_OPTIONS: "--max-old-space-size=10240" @@ -339,7 +341,6 @@ jobs: changed-files-check, front-task, front-build, - front-chromatic-deployment, merge-reports-and-check-coverage, front-sb-test, front-sb-build, 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 5fadd10d76..ec17cce3e8 100644 --- a/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts +++ b/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts @@ -4,7 +4,8 @@ test('Create Industry Select Field', async ({ page }) => { await page.getByRole('link', { name: 'Settings' }).click(); await page.getByRole('link', { name: 'Data model' }).click(); await page.getByRole('link', { name: 'Opportunities' }).click(); - await page.getByRole('button', { name: 'Add Field' }).click(); + await expect(page.getByRole('button', { name: 'New Field' })).toBeVisible(); + await page.getByRole('button', { 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('Industry'); diff --git a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts index 171308b696..1f2fd6ec94 100644 --- a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts +++ b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts @@ -28,7 +28,9 @@ test('Create workflow', async ({ page }) => { createWorkflowButton.click() ]); - const recordName = page.getByTestId('top-bar-title').getByText('Untitled'); + + const recordName = page.getByTestId('top-bar-title').getByPlaceholder('Name'); + await expect(recordName).toBeVisible(); await recordName.click(); const nameInput = page.getByTestId('top-bar-title').getByRole('textbox');