diff --git a/browser_tests/fixtures/utils/statusRetryRoutes.ts b/browser_tests/fixtures/utils/statusRetryRoutes.ts index 6ee64095abc..a4b21aeb904 100644 --- a/browser_tests/fixtures/utils/statusRetryRoutes.ts +++ b/browser_tests/fixtures/utils/statusRetryRoutes.ts @@ -1,7 +1,8 @@ import type { ErrorResponse } from '@comfyorg/ingest-types' import type { Page, Request, Route } from '@playwright/test' -export const CAPABILITIES_ROUTE = '**/api/billing/capabilities' +const CAPABILITIES_PATH = '/api/billing/capabilities' +export const CAPABILITIES_ROUTE = `**${CAPABILITIES_PATH}` export const STATUS_RETRY_PROBE_ROUTE = '**/api/status-retry-probe' const SERVICE_UNAVAILABLE: ErrorResponse = { @@ -14,6 +15,16 @@ export function fulfillUnavailable(route: Route): Promise { return route.fulfill({ status: 503, json: SERVICE_UNAVAILABLE }) } +/** Records every capabilities request whose response has finished downloading. */ +export function recordFinishedCapabilityReads(page: Page): Request[] { + const reads: Request[] = [] + page.on('requestfinished', (request) => { + if (new URL(request.url()).pathname.endsWith(CAPABILITIES_PATH)) + reads.push(request) + }) + return reads +} + /** Routes GETs on `routeGlob` to 503 for the first `unavailableCount` answers, recording each GET. */ export async function routeUnavailableGets( page: Page, diff --git a/browser_tests/tests/infrastructure/cloudStatusRetry.spec.ts b/browser_tests/tests/infrastructure/cloudStatusRetry.spec.ts index 300eadb7d43..b4b18dadbfd 100644 --- a/browser_tests/tests/infrastructure/cloudStatusRetry.spec.ts +++ b/browser_tests/tests/infrastructure/cloudStatusRetry.spec.ts @@ -12,6 +12,7 @@ import { STATUS_RETRY_PROBE_ROUTE, fetchThroughApp, fulfillUnavailable, + recordFinishedCapabilityReads, routeUnavailableGets } from '@e2e/fixtures/utils/statusRetryRoutes' @@ -50,11 +51,7 @@ test.describe('Shared request status retry', { tag: '@cloud' }, () => { CAPABILITIES_ROUTE, Number.POSITIVE_INFINITY ) - const finishedReads: Request[] = [] - page.on('requestfinished', (request) => { - if (request.url().endsWith('/api/billing/capabilities')) - finishedReads.push(request) - }) + const finishedReads = recordFinishedCapabilityReads(page) const content = await workspace.openPlanAndCreditsSettings()