Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: fix e2e tests
Kyle Mendell514a4ab81957
diff --git a/frontend/src/lib/services/activity-service.ts b/frontend/src/lib/services/activity-service.tsindex 96db98e7d..0131a1ed7 100644--- a/frontend/src/lib/services/activity-service.ts+++ b/frontend/src/lib/services/activity-service.ts@@ -13,7 +13,10 @@ class ActivityService extends BaseAPIService {async getActivities(options?: SearchPaginationSortRequest, environmentId?: string): Promise<Paginated<Activity>> {const envId = await this.resolveEnvironmentId(environmentId);const params = transformPaginationParams(options);- const res = await this.api.get(`/environments/${envId}/activities`, { params });+ const res = await this.api.get(`/environments/${envId}/activities`, {+ params,+ suppressAccessDeniedToast: true+ });return res.data;}diff --git a/frontend/src/lib/services/api-service.ts b/frontend/src/lib/services/api-service.tsindex 380091fb7..a812339a0 100644--- a/frontend/src/lib/services/api-service.ts+++ b/frontend/src/lib/services/api-service.ts@@ -8,6 +8,7 @@ export interface APIRequestConfig {params?: SearchParamsOption;responseType?: 'json' | 'text' | 'blob' | 'arrayBuffer';retry?: number;+ suppressAccessDeniedToast?: boolean;timeout?: number | false;}@@ -316,7 +317,7 @@ class APIClient {}}- if (errorResponse.status === 403 && typeof window !== 'undefined') {+ if (errorResponse.status === 403 && typeof window !== 'undefined' && !config.suppressAccessDeniedToast) {const reason = extractServerMessage(parsed) ?? 'You do not have permission to perform this action.';toast.error('Access denied', { description: reason });}diff --git a/tests/spec/activity-center.spec.ts b/tests/spec/activity-center.spec.tsindex c1223fec3..f2239de26 100644--- a/tests/spec/activity-center.spec.ts+++ b/tests/spec/activity-center.spec.ts@@ -123,7 +123,8 @@ function aggregatedActivityStreamBody(async function mockActivityReads(page: Page,activitiesByEnvironment: Record<string, MockActivity[]>,- failedEnvironmentIds = new Set<string>()+ failedEnvironmentIds = new Set<string>(),+ failedActivityStatus = 503) {await page.context().route(/\/api\/activities\/stream(?:\?.*)?$/, async (route: Route) => {await route.fulfill({@@ -145,9 +146,13 @@ async function mockActivityReads(if (failedEnvironmentIds.has(environmentId)) {await route.fulfill({- status: 503,+ status: failedActivityStatus,contentType: 'application/json',- body: JSON.stringify({ success: false, message: 'environment unavailable' })+ body: JSON.stringify({+ success: false,+ message: 'environment unavailable',+ detail: 'permission denied: activities:read'+ })});return;}@@ -160,6 +165,16 @@ async function mockActivityReads(});}+function waitForActivityRead(page: Page, environmentId: string) {+ return page.waitForResponse((response) => {+ const url = new URL(response.url());+ return (+ response.request().method() === 'GET' &&+ activityEnvironmentIdFromPath(url.pathname) === environmentId+ );+ });+}+function extractActivityId(value: unknown): string | undefined {if (!value || typeof value !== 'object') return undefined;@@ -284,13 +299,23 @@ test.describe('Activity Center', () => {{'0': [activity('local-activity', '0', 'Local', 'local-network', 5)]},- new Set(['remote-activity-test'])+ new Set(['remote-activity-test']),+ 403);const activityStream = waitForActivityStream(page);+ const remoteActivityRead = waitForActivityRead(page, 'remote-activity-test');await page.goto('/dashboard');await activityStream;+ await remoteActivityRead;await page.waitForLoadState('load');+ await page.waitForTimeout(250);++ await expect(+ page.locator('li[data-sonner-toast]').filter({ hasText: 'Access denied' })+ ).toHaveCount(0, {+ timeout: 500+ });const activityCenter = await openActivityCenter(page);await activityCenter.getByRole('button', { name: 'Completed' }).click();diff --git a/tests/spec/registries.spec.ts b/tests/spec/registries.spec.tsindex cec872cde..d741b349a 100644--- a/tests/spec/registries.spec.ts+++ b/tests/spec/registries.spec.ts@@ -95,9 +95,9 @@ test.describe('Container Registries', () => {).toBeVisible();await page.getByRole('button', { name: 'Refresh' }).click();- await expect(page.locator('li[data-sonner-toast] div[data-title]')).toBeVisible({- timeout: 10000- });+ await expect(+ page.locator('li[data-sonner-toast]').filter({ hasText: 'Registries Refreshed!' })+ ).toBeVisible({ timeout: 10000 });});test('should open Add Registry dialog and validate required fields', async ({ page }) => {