From c9054a43b6bc9bce52b886837d301dc2585d0888 Mon Sep 17 00:00:00 2001 From: Glary-Bot Date: Tue, 4 Aug 2026 22:09:39 +0000 Subject: [PATCH 1/2] ci: run typecheck:browser unconditionally in lint-format-verify The step was gated on a dorny/paths-filter check for browser_tests/**, so a src/ change that broke a type the E2E fixtures consume skipped the typecheck entirely, and merge_group runs have no diff for paths-filter to inspect. Nine type errors had already reached main this way: BillingStatusResponse gained required max_seats/occupied_seats fields that the cloud billing fixtures never picked up. Drop the gate and backfill the two fields on the affected fixtures. The typecheck takes ~11s, so running it on every PR, merge-queue and push run costs almost nothing. --- .github/actions/lint-format-verify/action.yml | 13 ++----------- browser_tests/fixtures/data/cloudWorkspace.ts | 9 +++++++-- .../tests/dialogs/pricingTableDeepLink.spec.ts | 8 ++++++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/actions/lint-format-verify/action.yml b/.github/actions/lint-format-verify/action.yml index 11420971237..6dcb8b32822 100644 --- a/.github/actions/lint-format-verify/action.yml +++ b/.github/actions/lint-format-verify/action.yml @@ -1,7 +1,7 @@ name: 'Lint and format verify' description: > - Runs the lint/format/knip verification suite plus a conditional - browser-tests typecheck. Shared by ci-lint-format.yaml (PR) and + Runs the lint/format/knip verification suite plus the browser-tests + typecheck. Shared by ci-lint-format.yaml (PR) and ci-lint-format-queue.yaml (merge queue) so both paths run the exact same checks. The caller is responsible for checkout and frontend setup before invoking this action. @@ -9,14 +9,6 @@ description: > runs: using: composite steps: - - name: Detect browser_tests changes - id: changed-paths - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 - with: - filters: | - browser_tests: - - 'browser_tests/**' - - name: Verify lint and format shell: bash run: | @@ -26,6 +18,5 @@ runs: pnpm knip - name: Typecheck browser tests - if: steps.changed-paths.outputs.browser_tests == 'true' shell: bash run: pnpm typecheck:browser diff --git a/browser_tests/fixtures/data/cloudWorkspace.ts b/browser_tests/fixtures/data/cloudWorkspace.ts index fbd97e53e74..45d18f85d52 100644 --- a/browser_tests/fixtures/data/cloudWorkspace.ts +++ b/browser_tests/fixtures/data/cloudWorkspace.ts @@ -70,6 +70,7 @@ export const DEFAULT_TEAM_MEMBERS: Member[] = [ ] const TEAM_PLAN_SLUG = 'team-pro-monthly' +const TEAM_PLAN_MAX_SEATS = 30 export const TEAM_BILLING_STATUS = { is_active: true, @@ -80,7 +81,9 @@ export const TEAM_BILLING_STATUS = { billing_status: 'paid', has_funds: true, renewal_date: '2099-02-20T00:00:00Z', - team_credit_stop: null + team_credit_stop: null, + max_seats: TEAM_PLAN_MAX_SEATS, + occupied_seats: DEFAULT_TEAM_MEMBERS.length } satisfies IngestBillingStatusResponse export const ENDED_STANDARD_BILLING_STATUS = { @@ -88,6 +91,8 @@ export const ENDED_STANDARD_BILLING_STATUS = { billing_status: 'inactive', has_funds: true, is_active: false, + max_seats: 1, + occupied_seats: DEFAULT_TEAM_MEMBERS.length, plan_slug: 'standard-monthly', subscription_duration: 'MONTHLY', subscription_status: 'ended', @@ -101,7 +106,7 @@ export const TEAM_PRO_PLAN: Plan = { duration: 'MONTHLY', price_cents: 10000, credits_cents: 21100, - max_seats: 30, + max_seats: TEAM_PLAN_MAX_SEATS, availability: { available: true }, seat_summary: { seat_count: 4, diff --git a/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts b/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts index a3c5f68c87a..7285be77b01 100644 --- a/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts +++ b/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts @@ -99,7 +99,9 @@ const ACTIVE_TEAM_STATUS = { id: 'team_700', credits_monthly: 147_700, stop_usd: 700 - } + }, + max_seats: 30, + occupied_seats: 1 } satisfies BillingStatusResponse const ACTIVE_STANDARD_STATUS = { @@ -111,7 +113,9 @@ const ACTIVE_STANDARD_STATUS = { billing_status: 'paid', has_funds: true, renewal_date: '2099-02-20T00:00:00Z', - team_credit_stop: null + team_credit_stop: null, + max_seats: STANDARD_ANNUAL_PLAN.max_seats, + occupied_seats: 1 } satisfies BillingStatusResponse const ACTIVE_CREATOR_STATUS = { From 0702bbeb07a0eeeda8e03030ec1a4c4ef889c34d Mon Sep 17 00:00:00 2001 From: Glary-Bot Date: Tue, 4 Aug 2026 23:05:04 +0000 Subject: [PATCH 2/2] test: drop redundant seat fixtures now that FE-1497 (#14050) landed on main The seat-capacity backfill in this branch duplicated the fields #14050 added to the same fixtures, so merging main in produced duplicate object keys. Main already makes typecheck:browser green; this branch is now the CI change alone. --- browser_tests/fixtures/data/cloudWorkspace.ts | 7 ++----- browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/browser_tests/fixtures/data/cloudWorkspace.ts b/browser_tests/fixtures/data/cloudWorkspace.ts index b4921fb3e47..cd8a900bd44 100644 --- a/browser_tests/fixtures/data/cloudWorkspace.ts +++ b/browser_tests/fixtures/data/cloudWorkspace.ts @@ -70,7 +70,6 @@ export const DEFAULT_TEAM_MEMBERS: Member[] = [ ] const TEAM_PLAN_SLUG = 'team-pro-monthly' -const TEAM_PLAN_MAX_SEATS = 30 export const TEAM_BILLING_STATUS = { is_active: true, @@ -83,9 +82,7 @@ export const TEAM_BILLING_STATUS = { billing_status: 'paid', has_funds: true, renewal_date: '2099-02-20T00:00:00Z', - team_credit_stop: null, - max_seats: TEAM_PLAN_MAX_SEATS, - occupied_seats: DEFAULT_TEAM_MEMBERS.length + team_credit_stop: null } satisfies IngestBillingStatusResponse export const ENDED_STANDARD_BILLING_STATUS = { @@ -108,7 +105,7 @@ export const TEAM_PRO_PLAN: Plan = { duration: 'MONTHLY', price_cents: 10000, credits_cents: 21100, - max_seats: TEAM_PLAN_MAX_SEATS, + max_seats: 30, availability: { available: true }, seat_summary: { seat_count: 4, diff --git a/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts b/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts index 8bce6f94657..6095ad686f9 100644 --- a/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts +++ b/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts @@ -101,9 +101,7 @@ const ACTIVE_TEAM_STATUS = { id: 'team_700', credits_monthly: 147_700, stop_usd: 700 - }, - max_seats: 30, - occupied_seats: 1 + } } satisfies BillingStatusResponse const ACTIVE_STANDARD_STATUS = { @@ -117,9 +115,7 @@ const ACTIVE_STANDARD_STATUS = { billing_status: 'paid', has_funds: true, renewal_date: '2099-02-20T00:00:00Z', - team_credit_stop: null, - max_seats: STANDARD_ANNUAL_PLAN.max_seats, - occupied_seats: 1 + team_credit_stop: null } satisfies BillingStatusResponse const ACTIVE_CREATOR_STATUS = {