Skip to content

Commit 81db1d3

Browse files
brandonkachenbrandonkachen
committed
fix: update tests to match API changes from origin/main
Test fixes to match updated API contracts and property names: - code-map: queryText → queryPathOrContent - billing: Updated mock implementations for async module loading - openrouter-ai-sdk: Fixed streaming test mocks for ReadableStream handling These test updates were previously in commit 119218a but were reverted. Re-applying only the test fixes without other changes from that commit.
1 parent 84355a9 commit 81db1d3

File tree

7 files changed

+737
-138
lines changed

7 files changed

+737
-138
lines changed

‎packages/billing/src/__tests__/credit-delegation.test.ts‎

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ describe('Credit Delegation', () => {
1717
error: () => {},
1818
}
1919

20-
beforeAll(() => {
20+
beforeAll(async () => {
2121
// Mock the org-billing functions that credit-delegation depends on
22-
mockModule('@codebuff/billing/org-billing', () => ({
22+
await mockModule('@codebuff/billing/org-billing', () => ({
2323
normalizeRepositoryUrl: mock((url: string) => url.toLowerCase().trim()),
2424
extractOwnerAndRepo: mock((url: string) => {
2525
if (url.includes('codebuffai/codebuff')) {
@@ -31,26 +31,61 @@ describe('Credit Delegation', () => {
3131
}))
3232

3333
// Mock common dependencies
34-
mockModule('@codebuff/common/db', () => ({
35-
default: {
36-
select: mock(() => ({
37-
from: mock(() => ({
38-
innerJoin: mock(() => ({
39-
where: mock(() =>
40-
Promise.resolve([{ orgId: 'org-123', orgName: 'CodebuffAI' }]),
41-
),
42-
})),
43-
})),
44-
})),
45-
},
46-
}))
34+
await mockModule('@codebuff/common/db', () => {
35+
const select = mock((fields: Record<string, unknown>) => {
36+
if ('orgId' in fields && 'orgName' in fields) {
37+
return {
38+
from: () => ({
39+
innerJoin: () => ({
40+
where: () =>
41+
Promise.resolve([
42+
{
43+
orgId: 'org-123',
44+
orgName: 'CodebuffAI',
45+
orgSlug: 'codebuffai',
46+
},
47+
]),
48+
}),
49+
}),
50+
}
51+
}
52+
53+
if ('repoUrl' in fields) {
54+
return {
55+
from: () => ({
56+
where: () =>
57+
Promise.resolve([
58+
{
59+
repoUrl: 'https://github.com/codebuffai/codebuff',
60+
repoName: 'codebuff',
61+
isActive: true,
62+
},
63+
]),
64+
}),
65+
}
66+
}
67+
68+
return {
69+
from: () => ({
70+
where: () => Promise.resolve([]),
71+
}),
72+
}
73+
})
74+
75+
return {
76+
default: {
77+
select,
78+
},
79+
}
80+
})
4781

48-
mockModule('@codebuff/common/db/schema', () => ({
82+
await mockModule('@codebuff/common/db/schema', () => ({
4983
orgMember: { org_id: 'org_id', user_id: 'user_id' },
50-
org: { id: 'id', name: 'name' },
84+
org: { id: 'id', name: 'name', slug: 'slug' },
5185
orgRepo: {
5286
org_id: 'org_id',
5387
repo_url: 'repo_url',
88+
repo_name: 'repo_name',
5489
is_active: 'is_active',
5590
},
5691
}))

‎packages/billing/src/__tests__/org-billing.test.ts‎

Lines changed: 73 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
clearMockedModules,
33
mockModule,
44
} from '@codebuff/common/testing/mock-modules'
5-
import { afterAll, beforeAll, describe, expect, it } from 'bun:test'
5+
import { afterAll, afterEach, beforeAll, describe, expect, it } from 'bun:test'
66

77
import {
88
calculateOrganizationUsageAndBalance,
@@ -49,56 +49,70 @@ const logger: Logger = {
4949
warn: () => {},
5050
}
5151

52-
describe('Organization Billing', () => {
53-
beforeAll(() => {
54-
mockModule('@codebuff/common/db', () => ({
55-
default: {
56-
select: () => ({
57-
from: () => ({
58-
where: () => ({
59-
orderBy: () => mockGrants,
60-
}),
61-
}),
62-
}),
63-
insert: () => ({
64-
values: () => Promise.resolve(),
52+
const createDbMock = (options?: {
53+
grants?: typeof mockGrants | any[]
54+
insert?: () => { values: () => Promise<unknown> }
55+
update?: () => { set: () => { where: () => Promise<unknown> } }
56+
}) => {
57+
const {
58+
grants = mockGrants,
59+
insert,
60+
update,
61+
} = options ?? {}
62+
63+
return {
64+
select: () => ({
65+
from: () => ({
66+
where: () => ({
67+
orderBy: () => grants,
6568
}),
66-
update: () => ({
67-
set: () => ({
68-
where: () => Promise.resolve(),
69-
}),
69+
}),
70+
}),
71+
insert:
72+
insert ??
73+
(() => ({
74+
values: () => Promise.resolve(),
75+
})),
76+
update:
77+
update ??
78+
(() => ({
79+
set: () => ({
80+
where: () => Promise.resolve(),
7081
}),
71-
},
82+
})),
83+
}
84+
}
85+
86+
describe('Organization Billing', () => {
87+
beforeAll(async () => {
88+
await mockModule('@codebuff/common/db', () => ({
89+
default: createDbMock(),
7290
}))
7391

74-
mockModule('@codebuff/common/db/transaction', () => ({
75-
withSerializableTransaction: (fn: any) =>
76-
fn({
77-
select: () => ({
78-
from: () => ({
79-
where: () => ({
80-
orderBy: () => mockGrants,
81-
}),
82-
}),
83-
}),
84-
update: () => ({
85-
set: () => ({
86-
where: () => Promise.resolve(),
87-
}),
88-
}),
89-
}),
92+
await mockModule('@codebuff/common/db/transaction', () => ({
93+
withSerializableTransaction: async ({
94+
callback,
95+
}: {
96+
callback: (tx: any) => Promise<unknown> | unknown
97+
}) => await callback(createDbMock()),
9098
}))
9199
})
92100

93101
afterAll(() => {
94102
clearMockedModules()
95103
})
96104

97-
describe('calculateOrganizationUsageAndBalance', () => {
98-
it('should calculate balance correctly with positive and negative balances', async () => {
99-
const organizationId = 'org-123'
100-
const quotaResetDate = new Date('2024-01-01')
101-
const now = new Date('2024-06-01')
105+
afterEach(async () => {
106+
await mockModule('@codebuff/common/db', () => ({
107+
default: createDbMock(),
108+
}))
109+
})
110+
111+
describe('calculateOrganizationUsageAndBalance', () => {
112+
it('should calculate balance correctly with positive and negative balances', async () => {
113+
const organizationId = 'org-123'
114+
const quotaResetDate = new Date('2024-01-01')
115+
const now = new Date('2024-06-01')
102116

103117
const result = await calculateOrganizationUsageAndBalance({
104118
organizationId,
@@ -118,19 +132,11 @@ describe('Organization Billing', () => {
118132
expect(result.usageThisCycle).toBe(800)
119133
})
120134

121-
it('should handle organization with no grants', async () => {
122-
// Mock empty grants
123-
mockModule('@codebuff/common/db', () => ({
124-
default: {
125-
select: () => ({
126-
from: () => ({
127-
where: () => ({
128-
orderBy: () => [],
129-
}),
130-
}),
131-
}),
132-
},
133-
}))
135+
it('should handle organization with no grants', async () => {
136+
// Mock empty grants
137+
await mockModule('@codebuff/common/db', () => ({
138+
default: createDbMock({ grants: [] }),
139+
}))
134140

135141
const organizationId = 'org-empty'
136142
const quotaResetDate = new Date('2024-01-01')
@@ -201,7 +207,7 @@ describe('Organization Billing', () => {
201207
it('should reject malformed URLs', () => {
202208
const result = validateAndNormalizeRepositoryUrl('not-a-url')
203209
expect(result.isValid).toBe(false)
204-
expect(result.error).toBe('Invalid URL format')
210+
expect(result.error).toBe('Repository domain not allowed')
205211
})
206212

207213
it('should accept allowed domains', () => {
@@ -255,19 +261,19 @@ describe('Organization Billing', () => {
255261
})
256262

257263
it('should handle duplicate operation IDs gracefully', async () => {
258-
// Mock database constraint error
259-
mockModule('@codebuff/common/db', () => ({
260-
default: {
261-
insert: () => ({
262-
values: () => {
263-
const error = new Error('Duplicate key')
264-
;(error as any).code = '23505'
265-
;(error as any).constraint = 'credit_ledger_pkey'
266-
throw error
267-
},
268-
}),
269-
},
270-
}))
264+
// Mock database constraint error
265+
await mockModule('@codebuff/common/db', () => ({
266+
default: createDbMock({
267+
insert: () => ({
268+
values: () => {
269+
const error = new Error('Duplicate key')
270+
;(error as any).code = '23505'
271+
;(error as any).constraint = 'credit_ledger_pkey'
272+
throw error
273+
},
274+
}),
275+
}),
276+
}))
271277

272278
const organizationId = 'org-123'
273279
const userId = 'user-123'

‎packages/code-map/__tests__/languages.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ describe('languages module', () => {
2222
languageTable.forEach((config) => {
2323
expect(config).toHaveProperty('extensions')
2424
expect(config).toHaveProperty('wasmFile')
25-
expect(config).toHaveProperty('queryText')
25+
expect(config).toHaveProperty('queryPathOrContent')
2626
expect(Array.isArray(config.extensions)).toBe(true)
2727
expect(config.extensions.length).toBeGreaterThan(0)
2828
expect(typeof config.wasmFile).toBe('string')
29-
expect(typeof config.queryText).toBe('string')
29+
expect(typeof config.queryPathOrContent).toBe('string')
3030
})
3131
})
3232

3333
it('should support TypeScript files', () => {
3434
const tsConfig = languageTable.find(c => c.extensions.includes('.ts'))
3535
expect(tsConfig).toBeDefined()
3636
expect(tsConfig?.wasmFile).toBe('tree-sitter-typescript.wasm')
37-
expect(tsConfig?.queryText).toBeDefined()
37+
expect(tsConfig?.queryPathOrContent).toBeDefined()
3838
})
3939

4040
it('should support TSX files', () => {
@@ -209,12 +209,12 @@ describe('languages module', () => {
209209
const config: LanguageConfig = {
210210
extensions: ['.test'],
211211
wasmFile: 'test.wasm',
212-
queryText: 'test query',
212+
queryPathOrContent: 'test query',
213213
}
214214

215215
expect(config.extensions).toEqual(['.test'])
216216
expect(config.wasmFile).toBe('test.wasm')
217-
expect(config.queryText).toBe('test query')
217+
expect(config.queryPathOrContent).toBe('test query')
218218
expect(config.parser).toBeUndefined()
219219
expect(config.query).toBeUndefined()
220220
expect(config.language).toBeUndefined()

0 commit comments

Comments
 (0)