Skip to content

Commit 154aad1

Browse files
icecrasher321icecrasher321
committed
fix tests
1 parent ddcc369 commit 154aad1

17 files changed

Lines changed: 174 additions & 72 deletions

File tree

‎apps/sim/app/api/folders/[id]/route.test.ts‎

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const { mockLogger, mockDbRef } = vi.hoisted(() => {
3434
})
3535

3636
const mockPerformDeleteFolder = workflowsOrchestrationMockFns.mockPerformDeleteFolder
37+
const mockPerformUpdateFolder = workflowsOrchestrationMockFns.mockPerformUpdateFolder
3738

3839
const mockGetUserEntityPermissions = permissionsMockFns.mockGetUserEntityPermissions
3940

@@ -54,16 +55,6 @@ vi.mock('@/lib/workflows/utils', () => workflowsUtilsMock)
5455

5556
import { DELETE, PUT } from '@/app/api/folders/[id]/route'
5657

57-
/** Type for captured folder values in tests */
58-
interface CapturedFolderValues {
59-
name?: string
60-
color?: string
61-
parentId?: string | null
62-
isExpanded?: boolean
63-
sortOrder?: number
64-
updatedAt?: Date
65-
}
66-
6758
interface FolderDbMockOptions {
6859
folderLookupResult?: any
6960
updateResult?: any[]
@@ -160,6 +151,41 @@ describe('Individual Folder API Route', () => {
160151
success: true,
161152
deletedItems: { folders: 1, workflows: 0 },
162153
})
154+
mockPerformUpdateFolder.mockImplementation(async (params) => {
155+
if (params.parentId && params.parentId === params.folderId) {
156+
return {
157+
success: false,
158+
error: 'Folder cannot be its own parent',
159+
errorCode: 'validation',
160+
}
161+
}
162+
if (
163+
params.parentId &&
164+
(await workflowsUtilsMockFns.mockCheckForCircularReference(
165+
params.folderId,
166+
params.parentId
167+
))
168+
) {
169+
return {
170+
success: false,
171+
error: 'Cannot create circular folder reference',
172+
errorCode: 'validation',
173+
}
174+
}
175+
return {
176+
success: true,
177+
folder: {
178+
...mockFolder,
179+
id: params.folderId,
180+
name: params.name !== undefined ? params.name.trim() : 'Updated Folder',
181+
color: params.color ?? mockFolder.color,
182+
parentId: params.parentId ?? mockFolder.parentId,
183+
isExpanded: params.isExpanded,
184+
sortOrder: params.sortOrder ?? mockFolder.sortOrder,
185+
updatedAt: new Date(),
186+
},
187+
}
188+
})
163189
workflowsUtilsMockFns.mockCheckForCircularReference.mockResolvedValue(false)
164190
})
165191

@@ -180,7 +206,7 @@ describe('Individual Folder API Route', () => {
180206
const data = await response.json()
181207
expect(data).toHaveProperty('folder')
182208
expect(data.folder).toMatchObject({
183-
name: 'Updated Folder',
209+
name: 'Updated Folder Name',
184210
})
185211
})
186212

@@ -285,44 +311,15 @@ describe('Individual Folder API Route', () => {
285311
it('should trim folder name when updating', async () => {
286312
mockAuthenticatedUser()
287313

288-
let capturedUpdates: CapturedFolderValues | null = null
289-
290-
const mockSelect = vi.fn().mockImplementation(() => ({
291-
from: vi.fn().mockImplementation(() => ({
292-
where: vi.fn().mockImplementation(() => ({
293-
then: vi.fn().mockImplementation((callback) => {
294-
return Promise.resolve(callback([mockFolder]))
295-
}),
296-
})),
297-
})),
298-
}))
299-
300-
const mockUpdate = vi.fn().mockImplementation(() => ({
301-
set: vi.fn().mockImplementation((updates) => {
302-
capturedUpdates = updates
303-
return {
304-
where: vi.fn().mockImplementation(() => ({
305-
returning: vi.fn().mockReturnValue([{ ...mockFolder, name: 'Folder With Spaces' }]),
306-
})),
307-
}
308-
}),
309-
}))
310-
311-
mockDbRef.current = {
312-
select: mockSelect,
313-
update: mockUpdate,
314-
delete: vi.fn(),
315-
}
316-
317314
const req = createMockRequest('PUT', {
318315
name: ' Folder With Spaces ',
319316
})
320317
const params = Promise.resolve({ id: 'folder-1' })
321318

322-
await PUT(req, { params })
319+
const response = await PUT(req, { params })
320+
const data = await response.json()
323321

324-
expect(capturedUpdates).not.toBeNull()
325-
expect(capturedUpdates!.name).toBe('Folder With Spaces')
322+
expect(data.folder.name).toBe('Folder With Spaces')
326323
})
327324

328325
it('should handle database errors gracefully', async () => {

‎apps/sim/app/api/folders/route.test.ts‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,11 @@ describe('Folders API Route', () => {
150150

151151
mockSelect.mockReturnValue({ from: mockFrom })
152152
mockFrom.mockReturnValue({ where: mockWhere })
153-
mockWhere.mockReturnValue({ orderBy: mockOrderBy })
153+
const defaultWhereResult = [] as Array<Record<string, unknown>> & {
154+
orderBy: typeof mockOrderBy
155+
}
156+
defaultWhereResult.orderBy = mockOrderBy
157+
mockWhere.mockReturnValue(defaultWhereResult)
154158
mockOrderBy.mockReturnValue(mockFolders)
155159

156160
mockInsert.mockReturnValue({ values: mockValues })
@@ -328,6 +332,14 @@ describe('Folders API Route', () => {
328332
},
329333
})
330334
)
335+
mockWhere
336+
.mockReturnValueOnce([{ minSortOrder: 5 }])
337+
.mockReturnValueOnce([{ minSortOrder: 2 }])
338+
mockValues.mockImplementationOnce((values: CapturedFolderValues) => {
339+
capturedValues = values
340+
return { returning: mockReturning }
341+
})
342+
mockReturning.mockReturnValueOnce([{ ...mockFolders[0], sortOrder: 1 }])
331343

332344
const req = createMockRequest('POST', {
333345
name: 'New Test Folder',
@@ -355,6 +367,7 @@ describe('Folders API Route', () => {
355367
insertResult: [{ ...mockFolders[1] }],
356368
})
357369
)
370+
mockReturning.mockReturnValueOnce([{ ...mockFolders[1] }])
358371

359372
const req = createMockRequest('POST', {
360373
name: 'Subfolder',
@@ -478,8 +491,8 @@ describe('Folders API Route', () => {
478491
it('should handle database errors gracefully', async () => {
479492
mockAuthenticatedUser()
480493

481-
mockTransaction.mockImplementationOnce(() => {
482-
throw new Error('Database transaction failed')
494+
mockInsert.mockImplementationOnce(() => {
495+
throw new Error('Database insert failed')
483496
})
484497

485498
const req = createMockRequest('POST', {
@@ -493,7 +506,7 @@ describe('Folders API Route', () => {
493506

494507
const data = await response.json()
495508
expect(data).toHaveProperty('error', 'Internal server error')
496-
expect(mockLogger.error).toHaveBeenCalledWith('Error creating folder:', {
509+
expect(mockLogger.error).toHaveBeenCalledWith('Failed to create workflow folder', {
497510
error: expect.any(Error),
498511
})
499512
})
@@ -512,6 +525,10 @@ describe('Folders API Route', () => {
512525
},
513526
})
514527
)
528+
mockValues.mockImplementationOnce((values: CapturedFolderValues) => {
529+
capturedValues = values
530+
return { returning: mockReturning }
531+
})
515532

516533
const req = createMockRequest('POST', {
517534
name: ' Test Folder With Spaces ',
@@ -538,6 +555,10 @@ describe('Folders API Route', () => {
538555
},
539556
})
540557
)
558+
mockValues.mockImplementationOnce((values: CapturedFolderValues) => {
559+
capturedValues = values
560+
return { returning: mockReturning }
561+
})
541562

542563
const req = createMockRequest('POST', {
543564
name: 'Test Folder',

‎apps/sim/app/api/tools/file/manage/route.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,14 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
154154
if (!moveResult.success) {
155155
return NextResponse.json(
156156
{ success: false, error: moveResult.error },
157-
{ status: moveResult.errorCode === 'conflict' ? 409 : 400 }
157+
{
158+
status:
159+
moveResult.errorCode === 'conflict'
160+
? 409
161+
: moveResult.errorCode === 'not_found'
162+
? 404
163+
: 400,
164+
}
158165
)
159166
}
160167
logger.info('File moved', { fileId, targetFolder: targetFolder || '(root)' })

‎apps/sim/app/api/workflows/[id]/route.test.ts‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const mockGetWorkflowById = workflowsUtilsMockFns.mockGetWorkflowById
2727
const mockAuthorizeWorkflowByWorkspacePermission =
2828
workflowAuthzMockFns.mockAuthorizeWorkflowByWorkspacePermission
2929
const mockPerformDeleteWorkflow = workflowsOrchestrationMockFns.mockPerformDeleteWorkflow
30+
const mockPerformUpdateWorkflow = workflowsOrchestrationMockFns.mockPerformUpdateWorkflow
3031

3132
const { mockDbUpdate, mockDbSelect, mockDbTransaction } = vi.hoisted(() => ({
3233
mockDbUpdate: vi.fn(),
@@ -85,6 +86,22 @@ describe('Workflow By ID API Route', () => {
8586
})
8687

8788
mockLoadWorkflowFromNormalizedTables.mockResolvedValue(null)
89+
mockPerformUpdateWorkflow.mockImplementation(async (params) => ({
90+
success: true,
91+
workflow: {
92+
id: params.workflowId,
93+
name: params.name ?? params.currentName,
94+
description: params.description ?? null,
95+
color: params.color ?? null,
96+
workspaceId: params.workspaceId,
97+
folderId: params.folderId ?? params.currentFolderId ?? null,
98+
sortOrder: params.sortOrder ?? null,
99+
locked: params.locked ?? null,
100+
createdAt: new Date(),
101+
updatedAt: new Date(),
102+
archivedAt: null,
103+
},
104+
}))
88105
mockDbTransaction.mockImplementation(async (callback) =>
89106
callback({
90107
execute: vi.fn().mockResolvedValue(undefined),
@@ -595,8 +612,11 @@ describe('Workflow By ID API Route', () => {
595612
workflow: mockWorkflow,
596613
workspacePermission: 'write',
597614
})
598-
599-
mockDuplicateCheck([{ id: 'workflow-other' }])
615+
mockPerformUpdateWorkflow.mockResolvedValueOnce({
616+
success: false,
617+
error: 'A workflow named "Duplicate Name" already exists in this folder',
618+
errorCode: 'conflict',
619+
})
600620

601621
const req = new NextRequest('http://localhost:3000/api/workflows/workflow-123', {
602622
method: 'PUT',
@@ -628,8 +648,11 @@ describe('Workflow By ID API Route', () => {
628648
workflow: mockWorkflow,
629649
workspacePermission: 'write',
630650
})
631-
632-
mockDuplicateCheck([{ id: 'workflow-other' }])
651+
mockPerformUpdateWorkflow.mockResolvedValueOnce({
652+
success: false,
653+
error: 'A workflow named "Duplicate Name" already exists in this folder',
654+
errorCode: 'conflict',
655+
})
633656

634657
const req = new NextRequest('http://localhost:3000/api/workflows/workflow-123', {
635658
method: 'PUT',
@@ -748,9 +771,11 @@ describe('Workflow By ID API Route', () => {
748771
workflow: mockWorkflow,
749772
workspacePermission: 'write',
750773
})
751-
752-
// Duplicate exists in target folder
753-
mockDuplicateCheck([{ id: 'workflow-other' }])
774+
mockPerformUpdateWorkflow.mockResolvedValueOnce({
775+
success: false,
776+
error: 'A workflow named "My Workflow" already exists in this folder',
777+
errorCode: 'conflict',
778+
})
754779

755780
const req = new NextRequest('http://localhost:3000/api/workflows/workflow-123', {
756781
method: 'PUT',

‎apps/sim/app/api/workflows/route.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ describe('Workflows API Route - POST ordering', () => {
8787

8888
it('uses top insertion against mixed siblings (folders + workflows)', async () => {
8989
const minResultsQueue: Array<Array<{ minOrder: number }>> = [
90+
[],
9091
[{ minOrder: 5 }],
9192
[{ minOrder: 2 }],
92-
[],
9393
]
9494

9595
mockDbSelect.mockImplementation(() => ({

‎apps/sim/app/api/workspaces/[id]/files/move/route.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ export const POST = withRouteHandler(
4040
{ success: false, error: result.error },
4141
{
4242
status:
43-
result.errorCode === 'conflict' ? 409 : result.errorCode === 'validation' ? 400 : 500,
43+
result.errorCode === 'conflict'
44+
? 409
45+
: result.errorCode === 'not_found'
46+
? 404
47+
: result.errorCode === 'validation'
48+
? 400
49+
: 500,
4450
}
4551
)
4652
}

‎apps/sim/lib/copilot/chat/post.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,8 @@ export async function handleUnifiedChatPost(req: NextRequest) {
885885
executionContextPromise,
886886
])
887887

888+
executionContext.userPermission = userPermission ?? undefined
889+
888890
if (persistedMessages) {
889891
conversationHistory = persistedMessages.filter((message) => {
890892
const record = message as Record<string, unknown>

‎apps/sim/lib/copilot/tools/server/files/create-file.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createLogger } from '@sim/logger'
2+
import { ensureWorkspaceAccess } from '@/lib/copilot/tools/handlers/access'
23
import {
34
assertServerToolNotAborted,
45
type BaseServerTool,
@@ -44,6 +45,7 @@ export const createFileServerTool: BaseServerTool<CreateFileArgs, CreateFileResu
4445
if (!workspaceId) {
4546
return { success: false, message: 'Workspace ID is required' }
4647
}
48+
await ensureWorkspaceAccess(workspaceId, context.userId, 'write')
4749

4850
const nested = params.args
4951
const fileName = params.fileName || (nested?.fileName as string) || ''

‎apps/sim/lib/copilot/tools/server/files/delete-file.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createLogger } from '@sim/logger'
22
import { DeleteFile } from '@/lib/copilot/generated/tool-catalog-v1'
3+
import { ensureWorkspaceAccess } from '@/lib/copilot/tools/handlers/access'
34
import {
45
assertServerToolNotAborted,
56
type BaseServerTool,
@@ -31,6 +32,7 @@ export const deleteFileServerTool: BaseServerTool<DeleteFileArgs, DeleteFileResu
3132
if (!workspaceId) {
3233
return { success: false, message: 'Workspace ID is required' }
3334
}
35+
await ensureWorkspaceAccess(workspaceId, context.userId, 'write')
3436

3537
const nested = params.args
3638
const fileIds: string[] =

‎apps/sim/lib/copilot/tools/server/files/download-to-workspace-file.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createLogger } from '@sim/logger'
22
import { z } from 'zod'
33
import { DownloadToWorkspaceFile } from '@/lib/copilot/generated/tool-catalog-v1'
4+
import { ensureWorkspaceAccess } from '@/lib/copilot/tools/handlers/access'
45
import {
56
assertServerToolNotAborted,
67
type BaseServerTool,
@@ -136,6 +137,7 @@ export const downloadToWorkspaceFileServerTool: BaseServerTool<
136137
if (!workspaceId) {
137138
return { success: false, message: 'Workspace ID is required' }
138139
}
140+
await ensureWorkspaceAccess(workspaceId, context.userId, 'write')
139141

140142
try {
141143
assertServerToolNotAborted(context)

0 commit comments

Comments
 (0)