Skip to content

Commit 5b47f77

Browse files
committed
chore(tests): drop defensive resets in non-mutating suites, merge sequential setEnvFlags calls
1 parent 2e4ba11 commit 5b47f77

10 files changed

Lines changed: 11 additions & 43 deletions

File tree

apps/sim/app/api/billing/update-cost/route.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ const KEYLESS_UPDATE_COST_BODY = {
147147
describe('POST /api/billing/update-cost — workspaceId attribution', () => {
148148
beforeEach(() => {
149149
vi.clearAllMocks()
150-
setEnvFlags({ isBillingEnabled: true })
151-
setEnvFlags({ isCopilotBillingProtocolRequired: false })
150+
setEnvFlags({ isBillingEnabled: true, isCopilotBillingProtocolRequired: false })
152151
mockCheckInternalApiKey.mockReturnValue({ success: true })
153152
mockRecordCumulativeUsage.mockResolvedValue({ billed: true, delta: 0.5, total: 0.5 })
154153
mockCheckAndBillOverageThreshold.mockResolvedValue(undefined)

apps/sim/app/api/schedules/execute/route.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,7 @@ describe('Scheduled Workflow Execution API Route', () => {
289289
dbChainMockFns.orderBy.mockReturnValue({ limit: orderByLimitMock } as never)
290290
dbChainMockFns.execute.mockResolvedValue([{ acquired: true }] as never)
291291
requestUtilsMockFns.mockGenerateRequestId.mockReturnValue('test-request-id')
292-
setEnvFlags({ isTriggerDevEnabled: false })
293-
setEnvFlags({ isHosted: false })
294-
setEnvFlags({ isProd: false })
295-
setEnvFlags({ isDev: true })
292+
setEnvFlags({ isTriggerDevEnabled: false, isHosted: false, isProd: false, isDev: true })
296293
mockShouldExecuteInline.mockReturnValue(false)
297294
mockEnqueue.mockReset()
298295
mockEnqueue.mockResolvedValue('job-id-1')

apps/sim/app/api/speech/token/route.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
dbChainMock,
77
queueTableRows,
88
resetDbChainMock,
9-
resetEnvFlagsMock,
109
schemaMock,
1110
} from '@sim/testing'
1211
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -128,8 +127,6 @@ afterAll(() => {
128127
resetDbChainMock()
129128
})
130129

131-
afterAll(resetEnvFlagsMock)
132-
133130
describe('POST /api/speech/token — usage attribution', () => {
134131
it('editor voice: bills the session user and stamps the verified workspace', async () => {
135132
const res = await POST(createMockRequest('POST', { workspaceId: 'ws-1' }))

apps/sim/blocks/utils.test.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ describe('getApiKeyCondition / shouldRequireApiKeyForModel', () => {
8888

8989
beforeEach(() => {
9090
vi.clearAllMocks()
91-
setEnvFlags({ isHosted: false })
92-
setEnvFlags({ isAzureConfigured: false })
93-
setEnvFlags({ isOllamaConfigured: false })
91+
setEnvFlags({ isHosted: false, isAzureConfigured: false, isOllamaConfigured: false })
9492
mockProviders.value = {
9593
base: { models: [], isLoading: false },
9694
ollama: { models: [], isLoading: false },
@@ -265,8 +263,7 @@ describe('getApiKeyCondition / shouldRequireApiKeyForModel', () => {
265263

266264
describe('self-hosted without OLLAMA_URL', () => {
267265
it('requires API key for any model (Ollama models cannot appear without OLLAMA_URL)', () => {
268-
setEnvFlags({ isHosted: false })
269-
setEnvFlags({ isOllamaConfigured: false })
266+
setEnvFlags({ isHosted: false, isOllamaConfigured: false })
270267
expect(evaluateCondition('llama3:latest')).toBe(true)
271268
expect(evaluateCondition('mistral:latest')).toBe(true)
272269
expect(evaluateCondition('gpt-4o')).toBe(true)

apps/sim/lib/api-key/byok.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @vitest-environment node
33
*/
4-
import { dbChainMock, dbChainMockFns, resetDbChainMock, resetEnvFlagsMock } from '@sim/testing'
4+
import { dbChainMock, dbChainMockFns, resetDbChainMock } from '@sim/testing'
55
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
66

77
const { mockDecryptSecret } = vi.hoisted(() => ({
@@ -52,8 +52,6 @@ const storedKey = (id: string) => ({ id, encryptedApiKey: `encrypted-${id}` })
5252

5353
afterAll(resetDbChainMock)
5454

55-
afterAll(resetEnvFlagsMock)
56-
5755
describe('getBYOKKey', () => {
5856
beforeEach(() => {
5957
vi.clearAllMocks()

apps/sim/lib/auth/ban.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
dbChainMockFns,
88
queueTableRows,
99
resetDbChainMock,
10-
resetEnvFlagsMock,
1110
schemaMock,
1211
} from '@sim/testing'
1312
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -31,8 +30,6 @@ import { getActivelyBannedUserIds, isBanActive, isEmailBlocked } from '@/lib/aut
3130

3231
afterAll(resetDbChainMock)
3332

34-
afterAll(resetEnvFlagsMock)
35-
3633
describe('isBanActive', () => {
3734
it('returns true for a permanent ban', () => {
3835
expect(isBanActive({ banned: true, banExpires: null })).toBe(true)

apps/sim/lib/billing/calculations/usage-monitor.test.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ describe('checkBillingBlocked', () => {
5454
beforeEach(() => {
5555
vi.clearAllMocks()
5656
resetDbChainMock()
57-
setEnvFlags({ isHosted: true })
58-
setEnvFlags({ isBillingEnabled: true })
57+
setEnvFlags({ isHosted: true, isBillingEnabled: true })
5958
dbChainMockFns.limit.mockResolvedValue([{ blocked: false, blockedReason: null }])
6059
})
6160

@@ -73,8 +72,7 @@ describe('checkBillingEntityBlocked', () => {
7372
beforeEach(() => {
7473
vi.clearAllMocks()
7574
resetDbChainMock()
76-
setEnvFlags({ isHosted: true })
77-
setEnvFlags({ isBillingEnabled: true })
75+
setEnvFlags({ isHosted: true, isBillingEnabled: true })
7876
mockIsOrganizationBillingBlocked.mockResolvedValue(false)
7977
dbChainMockFns.limit.mockResolvedValue([])
8078
})
@@ -113,8 +111,7 @@ describe('checkOrganizationMemberUsageLimit', () => {
113111
beforeEach(() => {
114112
vi.clearAllMocks()
115113
resetDbChainMock()
116-
setEnvFlags({ isHosted: true })
117-
setEnvFlags({ isBillingEnabled: true })
114+
setEnvFlags({ isHosted: true, isBillingEnabled: true })
118115
mockGetOrgMemberUsageLimit.mockResolvedValue(2)
119116
mockGetOrgMemberUsageForBillingPeriod.mockResolvedValue(1)
120117
})

apps/sim/lib/core/utils/urls.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/**
22
* @vitest-environment jsdom
33
*/
4-
import { resetEnvFlagsMock } from '@sim/testing'
5-
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
4+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
65

76
const { mockGetEnv } = vi.hoisted(() => ({
87
mockGetEnv: vi.fn<(key: string) => string | undefined>(),
@@ -29,8 +28,6 @@ function setLocation(url: string) {
2928
})
3029
}
3130

32-
afterAll(resetEnvFlagsMock)
33-
3431
describe('getBrowserOrigin', () => {
3532
it('returns the page origin in the browser', () => {
3633
setLocation('https://example.com/some/path')

apps/sim/lib/mcp/service-pool.test.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@
99
*/
1010
import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js'
1111
import { StreamableHTTPError } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
12-
import {
13-
dbChainMock,
14-
dbChainMockFns,
15-
loggerMock,
16-
resetDbChainMock,
17-
resetEnvFlagsMock,
18-
} from '@sim/testing'
12+
import { dbChainMock, dbChainMockFns, loggerMock, resetDbChainMock } from '@sim/testing'
1913
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
2014

2115
const {
@@ -115,8 +109,6 @@ vi.mock('@/lib/mcp/storage', () => ({
115109

116110
import { mcpService } from '@/lib/mcp/service'
117111

118-
afterAll(resetEnvFlagsMock)
119-
120112
describe('McpService connection reuse wiring', () => {
121113
beforeEach(() => {
122114
vi.clearAllMocks()

apps/sim/providers/index.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/**
22
* @vitest-environment node
33
*/
4-
import { resetEnvFlagsMock } from '@sim/testing'
5-
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
4+
import { beforeEach, describe, expect, it, vi } from 'vitest'
65

76
const { mockGetApiKeyWithBYOK, mockExecuteRequest } = vi.hoisted(() => ({
87
mockGetApiKeyWithBYOK: vi.fn(),
@@ -63,8 +62,6 @@ function makeAnthropicResponse(): ProviderResponse {
6362
}
6463
}
6564

66-
afterAll(resetEnvFlagsMock)
67-
6865
describe('executeProviderRequest — BYOK regression', () => {
6966
beforeEach(() => {
7067
vi.clearAllMocks()

0 commit comments

Comments
 (0)