From 38986f2137cd2adf20f5d04e51dd2a8ae4b58b1e Mon Sep 17 00:00:00 2001 From: dante01yoon Date: Tue, 4 Aug 2026 21:22:46 +0000 Subject: [PATCH] test(billing): cover recovery banner permissions Amp-Thread-ID: https://ampcode.com/threads/T-019fce91-ca23-725d-8fa8-e1c8093308aa Co-authored-by: Amp --- .../components/WorkspaceBillingSettings.ts | 34 ++++ browser_tests/fixtures/data/cloudWorkspace.ts | 12 ++ .../dialogs/billingStatusRecovery.spec.ts | 148 ++++++++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 browser_tests/fixtures/components/WorkspaceBillingSettings.ts create mode 100644 browser_tests/tests/dialogs/billingStatusRecovery.spec.ts diff --git a/browser_tests/fixtures/components/WorkspaceBillingSettings.ts b/browser_tests/fixtures/components/WorkspaceBillingSettings.ts new file mode 100644 index 00000000000..34028270f0b --- /dev/null +++ b/browser_tests/fixtures/components/WorkspaceBillingSettings.ts @@ -0,0 +1,34 @@ +import { expect } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' + +import { BaseDialog } from '@e2e/fixtures/components/BaseDialog' +import { waitForCloudApp } from '@e2e/fixtures/cloudAppFixture' + +export class WorkspaceBillingSettings extends BaseDialog { + readonly content: Locator + readonly statusBanner: Locator + + constructor(page: Page) { + super(page, page.getByTestId('settings-dialog')) + this.content = this.root.getByRole('main') + this.statusBanner = this.content.getByRole('status') + } + + async open(appUrl: string): Promise { + await this.page.goto(appUrl) + await waitForCloudApp(this.page) + await expect( + this.page.getByRole('status', { name: 'Loading ComfyUI' }) + ).toBeHidden() + await this.page.getByRole('button', { name: 'Close dialog' }).click() + await this.page + .getByRole('button', { name: /^Settings/ }) + .first() + .click() + await expect(this.root).toBeVisible() + await this.root + .locator('nav') + .getByRole('button', { name: 'Plan & Credits', exact: true }) + .click() + } +} diff --git a/browser_tests/fixtures/data/cloudWorkspace.ts b/browser_tests/fixtures/data/cloudWorkspace.ts index cd8a900bd44..ec0e8add881 100644 --- a/browser_tests/fixtures/data/cloudWorkspace.ts +++ b/browser_tests/fixtures/data/cloudWorkspace.ts @@ -99,6 +99,18 @@ export const ENDED_STANDARD_BILLING_STATUS = { team_credit_stop: null } satisfies IngestBillingStatusResponse & { billing_rail: 'stripe' } +export const PAYMENT_FAILED_TEAM_BILLING_STATUS = { + ...TEAM_BILLING_STATUS, + is_active: false, + billing_status: 'payment_failed' +} satisfies IngestBillingStatusResponse + +export const PAUSED_TEAM_BILLING_STATUS = { + ...TEAM_BILLING_STATUS, + is_active: false, + billing_status: 'paused' +} satisfies IngestBillingStatusResponse + export const TEAM_PRO_PLAN: Plan = { slug: TEAM_PLAN_SLUG, tier: 'PRO', diff --git a/browser_tests/tests/dialogs/billingStatusRecovery.spec.ts b/browser_tests/tests/dialogs/billingStatusRecovery.spec.ts new file mode 100644 index 00000000000..d7602af4732 --- /dev/null +++ b/browser_tests/tests/dialogs/billingStatusRecovery.spec.ts @@ -0,0 +1,148 @@ +import { expect } from '@playwright/test' +import type { + PaymentPortalRequest, + PaymentPortalResponse +} from '@comfyorg/ingest-types' + +import { cloudAppFixture as test } from '@e2e/fixtures/cloudAppFixture' +import { WorkspaceBillingSettings } from '@e2e/fixtures/components/WorkspaceBillingSettings' +import { + PAYMENT_FAILED_TEAM_BILLING_STATUS, + PAUSED_TEAM_BILLING_STATUS +} from '@e2e/fixtures/data/cloudWorkspace' +import { CLOUD_SELF_EMAIL } from '@e2e/fixtures/helpers/CloudAuthHelper' +import { APP_URL, setupCloudApp } from '@e2e/fixtures/utils/cloudAppSetup' +import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' +import { member, workspace } from '@e2e/fixtures/utils/workspaceMocks' + +test.describe('Team billing recovery visibility', { tag: '@cloud' }, () => { + test.describe('team owner with a failed payment', () => { + let settings: WorkspaceBillingSettings + let portalRequests: PaymentPortalRequest[] + + test.beforeEach(async ({ page }) => { + portalRequests = [] + await page.addInitScript(() => { + window.open = (url) => { + document.documentElement.dataset.openedUrl = String(url) + return window + } + }) + await setupCloudApp(page, { + workspace: workspace('team', 'owner'), + members: [ + member({ + email: CLOUD_SELF_EMAIL, + role: 'owner', + is_original_owner: true + }) + ], + features: { + billing_control_enabled: true, + v1_payment_recovery: true + } + }) + await page.route('**/api/billing/status', (route) => + route.fulfill(jsonRoute(PAYMENT_FAILED_TEAM_BILLING_STATUS)) + ) + await page.route('**/api/billing/payment-portal', (route) => { + portalRequests.push(route.request().postDataJSON()) + return route.fulfill( + jsonRoute({ + url: 'https://billing.stripe.com/session/e2e-recovery' + } satisfies PaymentPortalResponse) + ) + }) + settings = new WorkspaceBillingSettings(page) + await settings.open(APP_URL) + }) + + test('TB-22A exposes payment recovery and sends the current return URL', async ({ + page + }) => { + await expect(settings.statusBanner).toContainText('Payment failed') + const returnUrl = page.url() + + await settings.statusBanner + .getByRole('button', { name: 'Update payment' }) + .click() + + expect(portalRequests).toEqual([{ return_url: returnUrl }]) + await expect + .poll(() => page.locator('html').getAttribute('data-opened-url')) + .toBe('https://billing.stripe.com/session/e2e-recovery') + }) + }) + + test.describe('team member with a failed payment', () => { + let settings: WorkspaceBillingSettings + + test.beforeEach(async ({ page }) => { + await setupCloudApp(page, { + workspace: workspace('team', 'member'), + members: [ + member({ + email: 'creator@test.comfy.org', + role: 'owner', + is_original_owner: true + }), + member({ email: CLOUD_SELF_EMAIL, role: 'member' }) + ], + features: { + billing_control_enabled: true, + v1_payment_recovery: true + } + }) + await page.route('**/api/billing/status', (route) => + route.fulfill(jsonRoute(PAYMENT_FAILED_TEAM_BILLING_STATUS)) + ) + settings = new WorkspaceBillingSettings(page) + await settings.open(APP_URL) + }) + + test('TB-22B keeps payment failure details and recovery private', async () => { + await expect(settings.statusBanner).toHaveCount(0) + await expect( + settings.content.getByRole('button', { name: 'Update payment' }) + ).toHaveCount(0) + await expect(settings.content).not.toContainText('Payment failed') + }) + }) + + test.describe('team member with a paused subscription', () => { + let settings: WorkspaceBillingSettings + + test.beforeEach(async ({ page }) => { + await setupCloudApp(page, { + workspace: workspace('team', 'member'), + members: [ + member({ + email: 'creator@test.comfy.org', + role: 'owner', + is_original_owner: true + }), + member({ email: CLOUD_SELF_EMAIL, role: 'member' }) + ], + features: { + billing_control_enabled: true, + v1_payment_recovery: true + } + }) + await page.route('**/api/billing/status', (route) => + route.fulfill(jsonRoute(PAUSED_TEAM_BILLING_STATUS)) + ) + settings = new WorkspaceBillingSettings(page) + await settings.open(APP_URL) + }) + + test('TB-22C shows a role-safe pause notice without billing controls', async () => { + await expect(settings.statusBanner).toContainText('Subscription paused') + await expect(settings.statusBanner).toContainText( + "Ask your workspace owner to restore the workspace's subscription." + ) + await expect( + settings.statusBanner.getByRole('button', { name: 'Update payment' }) + ).toHaveCount(0) + }) + }) +})