diff --git a/tests/e2e/helpers/url.ts b/tests/e2e/helpers/url.ts index 61c4c2425..a6fc879ac 100644 --- a/tests/e2e/helpers/url.ts +++ b/tests/e2e/helpers/url.ts @@ -12,7 +12,7 @@ export function getOrganizationIdFromUrl(pathname: string) { export function getProjectIdFromUrl(pathname: string) { // TODO: use base path from svelte here - const regex = /\/console\/project-([^/]+)(\/.*)?/; + const regex = /\/console\/project-(?:[a-z]{2,3}-)?([^/]+)(\/.*)?/; const match = pathname.match(regex); if (match) { diff --git a/tests/e2e/journeys/upgrade-free-tier.spec.ts b/tests/e2e/journeys/upgrade-free-tier.spec.ts index 024379820..e102e1d0d 100644 --- a/tests/e2e/journeys/upgrade-free-tier.spec.ts +++ b/tests/e2e/journeys/upgrade-free-tier.spec.ts @@ -14,6 +14,6 @@ test('upgrade - free tier', async ({ page }) => { await enterCreditCard(page); // skip members await page.getByRole('button', { name: 'change plan' }).click(); - await page.waitForURL('**/console/project-*/overview/platforms'); + await page.waitForURL(/\/console\/project-(?:[a-z0-9]+-)?([^/]+)\/overview\/platforms/); }); }); diff --git a/tests/e2e/steps/free-project.ts b/tests/e2e/steps/free-project.ts index 6a51bf313..2cd90932f 100644 --- a/tests/e2e/steps/free-project.ts +++ b/tests/e2e/steps/free-project.ts @@ -24,7 +24,7 @@ export async function createFreeProject(page: Page): Promise { await page.getByRole('button', { name: 'next' }).click(); await page.locator('label').filter({ hasText: 'Frankfurt' }).click(); await page.getByRole('button', { name: 'create' }).click(); - await page.waitForURL('./project-**/overview/platforms'); + await page.waitForURL(/\/project-(?:[a-z0-9]+-)?([^/]+)\/overview\/platforms/); expect(page.url()).toContain('/console/project-'); return getProjectIdFromUrl(page.url()); diff --git a/tests/e2e/steps/pro-project.ts b/tests/e2e/steps/pro-project.ts index 566658aff..4b6028a33 100644 --- a/tests/e2e/steps/pro-project.ts +++ b/tests/e2e/steps/pro-project.ts @@ -49,7 +49,7 @@ export async function createProProject(page: Page): Promise { await page.getByRole('button', { name: 'next' }).click(); await page.locator('label').filter({ hasText: 'frankfurt' }).click(); await page.getByRole('button', { name: 'create' }).click(); - await page.waitForURL('./project-**/overview/platforms'); + await page.waitForURL(/\/project-(?:[a-z0-9]+-)?([^/]+)\/overview\/platforms/); expect(page.url()).toContain('/project-'); return getProjectIdFromUrl(page.url());