From edb91d7c55824a8ce781188b159185fb9e823142 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 29 Aug 2025 12:07:25 +0530 Subject: [PATCH 1/7] fix: e2e flow. Signed-off-by: Darshan --- e2e/journeys/upgrade-free-tier.spec.ts | 5 ++++- src/lib/components/billing/selectPaymentMethod.svelte | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/e2e/journeys/upgrade-free-tier.spec.ts b/e2e/journeys/upgrade-free-tier.spec.ts index 80802f499..4d31cf0c8 100644 --- a/e2e/journeys/upgrade-free-tier.spec.ts +++ b/e2e/journeys/upgrade-free-tier.spec.ts @@ -10,7 +10,10 @@ test('upgrade - free tier', async ({ page }) => { await page.getByRole('link', { name: 'Upgrade', exact: true }).click(); await page.waitForURL(/\/organization-[^/]+\/change-plan/); await page.locator('input[value="tier-1"]').click(); - await page.getByRole('button', { name: 'add' }).first().click(); + + await page + .locator('#no-payments-card-stack') + .getByRole('button', { name: 'add' }).first().click(); await enterCreditCard(page); diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte index 30e5ea254..aacbaac99 100644 --- a/src/lib/components/billing/selectPaymentMethod.svelte +++ b/src/lib/components/billing/selectPaymentMethod.svelte @@ -78,7 +78,7 @@ {:else} - + Date: Fri, 29 Aug 2025 12:07:52 +0530 Subject: [PATCH 2/7] update: sync calls. Signed-off-by: Darshan --- .../organization-[organization]/change-plan/+page.svelte | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte index 1d39fdbc5..2a0a19721 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte @@ -143,11 +143,13 @@ null ); - trackDowngradeFeedback(); - - await invalidate(Dependencies.ORGANIZATION); + await Promise.all([ + await trackDowngradeFeedback(), + await invalidate(Dependencies.ORGANIZATION), + ]) await goto(previousPage); + addNotification({ type: 'success', message: `${$organization.name} plan has been successfully updated.` From b8668ae50227ae1380844897bd2be6cf5a4a4889 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 29 Aug 2025 12:08:24 +0530 Subject: [PATCH 3/7] lint! Signed-off-by: Darshan --- e2e/journeys/upgrade-free-tier.spec.ts | 4 +++- .../organization-[organization]/change-plan/+page.svelte | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/e2e/journeys/upgrade-free-tier.spec.ts b/e2e/journeys/upgrade-free-tier.spec.ts index 4d31cf0c8..52f6153cf 100644 --- a/e2e/journeys/upgrade-free-tier.spec.ts +++ b/e2e/journeys/upgrade-free-tier.spec.ts @@ -13,7 +13,9 @@ test('upgrade - free tier', async ({ page }) => { await page .locator('#no-payments-card-stack') - .getByRole('button', { name: 'add' }).first().click(); + .getByRole('button', { name: 'add' }) + .first() + .click(); await enterCreditCard(page); diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte index 2a0a19721..da77cdc87 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte @@ -145,11 +145,11 @@ await Promise.all([ await trackDowngradeFeedback(), - await invalidate(Dependencies.ORGANIZATION), - ]) + await invalidate(Dependencies.ORGANIZATION) + ]); await goto(previousPage); - + addNotification({ type: 'success', message: `${$organization.name} plan has been successfully updated.` From 22d1efe85baa5de88dc3f85528cca4b1c2de94d5 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 29 Aug 2025 12:17:05 +0530 Subject: [PATCH 4/7] simplify. Signed-off-by: Darshan --- e2e/journeys/upgrade-free-tier.spec.ts | 6 ------ e2e/steps/pro-project.ts | 16 +++++++++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/e2e/journeys/upgrade-free-tier.spec.ts b/e2e/journeys/upgrade-free-tier.spec.ts index 52f6153cf..55c759a66 100644 --- a/e2e/journeys/upgrade-free-tier.spec.ts +++ b/e2e/journeys/upgrade-free-tier.spec.ts @@ -11,12 +11,6 @@ test('upgrade - free tier', async ({ page }) => { await page.waitForURL(/\/organization-[^/]+\/change-plan/); await page.locator('input[value="tier-1"]').click(); - await page - .locator('#no-payments-card-stack') - .getByRole('button', { name: 'add' }) - .first() - .click(); - await enterCreditCard(page); // wait for a second after adding a card to update the UI. diff --git a/e2e/steps/pro-project.ts b/e2e/steps/pro-project.ts index 438caebef..bae9a5357 100644 --- a/e2e/steps/pro-project.ts +++ b/e2e/steps/pro-project.ts @@ -7,12 +7,15 @@ type Metadata = { }; export async function enterCreditCard(page: Page) { - const dialog = page.locator('.modal').filter({ - hasText: 'add payment method' - }); - await dialog.waitFor({ - state: 'visible' - }); + // click the add payment method and open the modal + await page + .locator('#no-payments-card-stack') + .getByRole('button', { name: 'add' }) + .first() + .click(); + + const dialog = page.locator('.modal').filter({ hasText: 'add payment method' }); + await dialog.waitFor({ state: 'visible' }); await page.getByPlaceholder('cardholder').fill('Test User'); const stripe = page.locator('[title="Secure payment input frame"]').nth(0).contentFrame(); await stripe.locator('id=Field-numberInput').fill('4242424242424242'); @@ -35,7 +38,6 @@ export async function createProProject(page: Page): Promise { await page.getByRole('radio', { name: /^Pro\b/ }).check(); // `create organization` because there's already free created on start! await page.getByRole('button', { name: 'create organization' }).click(); - await page.getByRole('button', { name: 'add' }).first().click(); await enterCreditCard(page); // skip members await page.getByRole('button', { name: 'create organization' }).click(); From 8f8139e4fdaec9048e6007c546ed749ce89d2389 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 29 Aug 2025 12:23:46 +0530 Subject: [PATCH 5/7] Update e2e/steps/pro-project.ts --- e2e/steps/pro-project.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/steps/pro-project.ts b/e2e/steps/pro-project.ts index bae9a5357..94cbb601f 100644 --- a/e2e/steps/pro-project.ts +++ b/e2e/steps/pro-project.ts @@ -7,7 +7,7 @@ type Metadata = { }; export async function enterCreditCard(page: Page) { - // click the add payment method and open the modal + // click the `add` button inside correct view layer await page .locator('#no-payments-card-stack') .getByRole('button', { name: 'add' }) From a87fc186417f8468f4daefce595ab2d0c9cd04d9 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 29 Aug 2025 12:27:50 +0530 Subject: [PATCH 6/7] fix: no awaits inside `promise.all`. --- .../organization-[organization]/change-plan/+page.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte index da77cdc87..22c950c50 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte @@ -144,8 +144,8 @@ ); await Promise.all([ - await trackDowngradeFeedback(), - await invalidate(Dependencies.ORGANIZATION) + trackDowngradeFeedback(), + invalidate(Dependencies.ORGANIZATION) ]); await goto(previousPage); From 0ec01c04c2fff0645bd750b48031f47360d282ff Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 29 Aug 2025 12:30:35 +0530 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20formatter=20lint=20=F0=9F=98=A1!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization-[organization]/change-plan/+page.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte index 22c950c50..b5ef36e43 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte @@ -143,10 +143,7 @@ null ); - await Promise.all([ - trackDowngradeFeedback(), - invalidate(Dependencies.ORGANIZATION) - ]); + await Promise.all([trackDowngradeFeedback(), invalidate(Dependencies.ORGANIZATION)]); await goto(previousPage);