diff --git a/e2e/steps/account.ts b/e2e/steps/account.ts index 5a74a736ee..1ea9dd9e81 100644 --- a/e2e/steps/account.ts +++ b/e2e/steps/account.ts @@ -26,7 +26,28 @@ export function registerUserStep(page: Page): Promise { await inputs.password.fill(values.password); await inputs.terms.check({ force: true }); await page.getByRole('button', { name: 'Sign up', exact: true }).click(); - await page.waitForURL('./onboarding/create-project'); + + const postSignup = + /\/(onboarding\/create-project|onboarding\/create-organization|verify-email|organization-)/; + try { + await page.waitForURL(postSignup, { timeout: 60000 }); + } catch { + const toast = await page + .locator('[role="alert"], [role="status"]') + .first() + .textContent({ timeout: 1000 }) + .catch(() => ''); + throw new Error( + `Signup did not navigate away from the register page. url=${page.url()} toast=${toast?.trim() ?? ''}` + ); + } + + if (page.url().includes('/verify-email')) { + test.skip( + true, + 'Staging requires console email verification; onboarding e2e cannot continue.' + ); + } return values; }); diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte index 1606d0195e..560128ad15 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -411,10 +411,13 @@ {#key extensions.length} + {/key} diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte index ec7608b13c..9e658dc901 100644 --- a/src/routes/(public)/(guest)/register/+page.svelte +++ b/src/routes/(public)/(guest)/register/+page.svelte @@ -85,10 +85,10 @@ page.url.searchParams.delete('redirect'); if (redirect) { await goto(`${redirect}${page.url.search}`); - } else if (isCloud) { + } else if (isCloud && page.url.searchParams.has('type')) { checkPricingRefAndRedirect(page.url.searchParams); } else { - await goto(`${base}/${page.url.search ?? ''}`); + await goto(`${base}${page.url.search ?? ''}`); } } else { await goto(base);