From 97a8bb4c5647a66a22fc80b001720a2f03f0db60 Mon Sep 17 00:00:00 2001 From: dal Date: Fri, 18 Jul 2025 16:02:24 -0600 Subject: [PATCH] lint errors done & unit tests passing --- apps/server/src/api/v2/slack/events.test.ts | 24 +++++++++++++++++++ apps/server/src/api/v2/slack/handler.test.ts | 8 +++---- .../metrics/charts/chartConfigProps.test.ts | 2 +- .../charts/chatConfig.defaults.test.ts | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/apps/server/src/api/v2/slack/events.test.ts b/apps/server/src/api/v2/slack/events.test.ts index e06d27fae..b9646fc22 100644 --- a/apps/server/src/api/v2/slack/events.test.ts +++ b/apps/server/src/api/v2/slack/events.test.ts @@ -32,6 +32,12 @@ describe('findOrCreateSlackChat', () => { limit: vi.fn().mockResolvedValue([]), } as any; } + // Mock for slack integration query + return { + from: vi.fn().mockReturnThis(), + where: vi.fn().mockReturnThis(), + limit: vi.fn().mockResolvedValue([{ defaultSharingPermissions: 'shareWithWorkspace' }]), + } as any; }); // Mock insert @@ -81,6 +87,12 @@ describe('findOrCreateSlackChat', () => { limit: vi.fn().mockResolvedValue([]), } as any; } + // Mock for slack integration query + return { + from: vi.fn().mockReturnThis(), + where: vi.fn().mockReturnThis(), + limit: vi.fn().mockResolvedValue([{ defaultSharingPermissions: 'shareWithChannel' }]), + } as any; }); // Mock insert @@ -130,6 +142,12 @@ describe('findOrCreateSlackChat', () => { limit: vi.fn().mockResolvedValue([{ id: 'existing-chat-id' }]), } as any; } + // Mock for slack integration query (won't be used due to early return) + return { + from: vi.fn().mockReturnThis(), + where: vi.fn().mockReturnThis(), + limit: vi.fn().mockResolvedValue([]), + } as any; }); const result = await findOrCreateSlackChat({ @@ -161,6 +179,12 @@ describe('findOrCreateSlackChat', () => { limit: vi.fn().mockResolvedValue([]), } as any; } + // Mock for slack integration query - no integration found + return { + from: vi.fn().mockReturnThis(), + where: vi.fn().mockReturnThis(), + limit: vi.fn().mockResolvedValue([]), + } as any; }); // Mock insert diff --git a/apps/server/src/api/v2/slack/handler.test.ts b/apps/server/src/api/v2/slack/handler.test.ts index 6dc1d8d67..dad442b2b 100644 --- a/apps/server/src/api/v2/slack/handler.test.ts +++ b/apps/server/src/api/v2/slack/handler.test.ts @@ -136,7 +136,7 @@ describe('SlackHandler', () => { await handler.handleOAuthCallback(mockContext); expect(mockContext.redirect).toHaveBeenCalledWith( - 'http://localhost:3000/app/settings/integrations?status=cancelled' + '/app/settings/integrations?status=cancelled' ); }); @@ -146,7 +146,7 @@ describe('SlackHandler', () => { await handler.handleOAuthCallback(mockContext); expect(mockContext.redirect).toHaveBeenCalledWith( - 'http://localhost:3000/app/settings/integrations?status=error&error=invalid_parameters' + '/app/settings/integrations?status=error&error=invalid_parameters' ); }); @@ -171,7 +171,7 @@ describe('SlackHandler', () => { state: 'test-state', }); expect(mockContext.redirect).toHaveBeenCalledWith( - 'http://localhost:3000/dashboard?status=success&workspace=Test%20Workspace' + '/dashboard?status=success&workspace=Test%20Workspace' ); }); @@ -191,7 +191,7 @@ describe('SlackHandler', () => { await handler.handleOAuthCallback(mockContext); expect(mockContext.redirect).toHaveBeenCalledWith( - 'http://localhost:3000/app/settings/integrations?status=error&error=invalid_state' + '/app/settings/integrations?status=error&error=invalid_state' ); }); }); diff --git a/packages/server-shared/src/metrics/charts/chartConfigProps.test.ts b/packages/server-shared/src/metrics/charts/chartConfigProps.test.ts index 654b3e713..2ff48850b 100644 --- a/packages/server-shared/src/metrics/charts/chartConfigProps.test.ts +++ b/packages/server-shared/src/metrics/charts/chartConfigProps.test.ts @@ -29,7 +29,7 @@ describe('chartConfigProps', () => { }); it('should have the expected color palette', () => { - expect(DEFAULT_CHART_CONFIG.colors).toBeUndefined(); + expect(DEFAULT_CHART_CONFIG.colors).toEqual(DEFAULT_CHART_THEME); expect(DEFAULT_CHART_THEME).toEqual([ '#B399FD', '#FC8497', diff --git a/packages/server-shared/src/metrics/charts/chatConfig.defaults.test.ts b/packages/server-shared/src/metrics/charts/chatConfig.defaults.test.ts index 6c1da7b7f..7b9f560a5 100644 --- a/packages/server-shared/src/metrics/charts/chatConfig.defaults.test.ts +++ b/packages/server-shared/src/metrics/charts/chatConfig.defaults.test.ts @@ -12,7 +12,7 @@ describe('DEFAULT_CHART_CONFIG', () => { const config = parseResult.data; // Test key default values - expect(config.colors).toBeUndefined(); + expect(config.colors).toEqual(DEFAULT_CHART_THEME); expect(config.gridLines).toBe(true); expect(config.showLegendHeadline).toBe(false); expect(config.disableTooltip).toBe(false);