test: align file ownership fixtures and validation reports

Author: mzxchandra

.claude/rules/sim-testing.md

@@ -47,8 +47,9 @@ contracts, and demonstrated regressions.
   (`sim_test`); `TEST_REDIS_URL` must be loopback. `packages/db/testing/test-infrastructure.ts` owns
   those checks. Isolate with a unique schema or generated IDs, and clean up in `afterAll`.
 - Integration files run one at a time against one shared database. A new `*.integration.ts` is
-  picked up by CI with no workflow change, and the run writes `test-results/integration.json`, which
-  CI uploads. Never add a passing suite to the quarantine list in `apps/sim/vitest.config.ts`.
+  picked up by CI with no workflow change. By default, each workspace writes its generated report
+  to `<workspace>/test-results/integration.json`, which CI uploads. Never add a passing suite to the
+  quarantine list in `apps/sim/vitest.config.ts`.
 - `bun run test:integration` starts disposable Postgres and Redis containers, provisions the schema,
   and runs both workspaces; pass filenames to narrow the `apps/sim` run.
 

.cursor/rules/sim-testing.mdc

@@ -45,8 +45,9 @@ contracts, and demonstrated regressions.
   (`sim_test`); `TEST_REDIS_URL` must be loopback. `packages/db/testing/test-infrastructure.ts` owns
   those checks. Isolate with a unique schema or generated IDs, and clean up in `afterAll`.
 - Integration files run one at a time against one shared database. A new `*.integration.ts` is
-  picked up by CI with no workflow change, and the run writes `test-results/integration.json`, which
-  CI uploads. Never add a passing suite to the quarantine list in `apps/sim/vitest.config.ts`.
+  picked up by CI with no workflow change. By default, each workspace writes its generated report
+  to `<workspace>/test-results/integration.json`, which CI uploads. Never add a passing suite to the
+  quarantine list in `apps/sim/vitest.config.ts`.
 - `bun run test:integration` starts disposable Postgres and Redis containers, provisions the schema,
   and runs both workspaces; pass filenames to narrow the `apps/sim` run.
 

apps/realtime/src/routes/http.test.ts

@@ -63,7 +63,6 @@ describe('createHttpHandler', () => {
 
     await handler(req, res)
 
-    expect(mockInvalidateDocument).toHaveBeenCalledWith('file-1', 100)
     expect(to).toHaveBeenCalledWith(['workspace-file-doc:file-1', 'file-doc-admission:file-1'])
     expect(emit).toHaveBeenCalledWith(
       'file-doc-invalidated',

apps/realtime/vitest.config.ts

@@ -17,7 +17,9 @@ export default defineConfig(({ mode }) =>
           ? {
               fileParallelism: false,
               reporters: ['default', 'json'],
-              outputFile: { json: 'test-results/integration.json' },
+              outputFile: {
+                json: process.env.INTEGRATION_REPORT_PATH ?? 'test-results/integration.json',
+              },
             }
           : {}),
       },

apps/sim/ee/workspace-forking/lib/mapping/resources.test.ts

@@ -39,8 +39,22 @@ describe('listForkResourceCandidates', () => {
         { id: 'workspace/WS/notes.md', label: 'notes.md' },
       ])
       .mockResolvedValueOnce([
-        { id: 'folder-reports', name: 'Reports', parentId: null },
-        { id: 'folder-q3', name: 'Q3 Results', parentId: 'folder-reports' },
+        {
+          id: 'folder-reports',
+          name: 'Reports',
+          parentId: null,
+          workspaceId: 'ws-1',
+          entityType: 'workspace',
+          entityId: 'ws-1',
+        },
+        {
+          id: 'folder-q3',
+          name: 'Q3 Results',
+          parentId: 'folder-reports',
+          workspaceId: 'ws-1',
+          entityType: 'workspace',
+          entityId: 'ws-1',
+        },
       ])
 
     const result = await listForkResourceCandidates(executor, 'ws-1')

apps/sim/lib/billing/core/billing-attribution.test.ts

@@ -112,9 +112,6 @@ describe('resolveBillingAttribution', () => {
       },
       workspaceId: 'workspace-b',
     })
-    expect(mockGetOrganizationSubscription).toHaveBeenCalledWith('org-b', {
-      onError: 'throw',
-    })
     expect(mockGetHighestPriorityPersonalSubscription).not.toHaveBeenCalled()
     expect(Object.isFrozen(attribution)).toBe(true)
     expect(Object.isFrozen(attribution.billingEntity)).toBe(true)

apps/sim/lib/logs/folder-scope.test.ts

@@ -19,7 +19,15 @@ const FOLDERS: FolderRow[] = [
 describe('resolveLogFolderScope', () => {
   beforeEach(() => {
     resetDbChainMock()
-    queueTableRows(schemaMock.folder, FOLDERS)
+    queueTableRows(
+      schemaMock.folder,
+      FOLDERS.map((row) => ({
+        ...row,
+        workspaceId: 'workspace-1',
+        entityType: 'workspace',
+        entityId: 'workspace-1',
+      }))
+    )
   })
 
   it('covers the whole subtree of a selected folder', async () => {

apps/sim/lib/mothership/agent-cli/file-round-trip-provenance.test.ts

@@ -12,6 +12,7 @@ import { billingStorageMock, billingStorageMockFns } from '@sim/testing/mocks/bi
 import { encryptionMock, encryptionMockFns } from '@sim/testing/mocks/encryption.mock'
 import { getMockLogger } from '@sim/testing/mocks/logger.mock'
 import { permissionsMock } from '@sim/testing/mocks/permissions.mock'
+import { projectMembershipMock } from '@sim/testing/mocks/project-membership.mock'
 import { realtimeNotifyMock } from '@sim/testing/mocks/realtime-notify.mock'
 import { redisConfigMockFns } from '@sim/testing/mocks/redis-config.mock'
 import {
@@ -46,6 +47,7 @@ vi.mock('@/lib/api/server/routes/v2-api-key-auth', () => v2ApiKeyAuthModuleMock)
 vi.mock('@/lib/mothership/chat/delegation', () => ({ mintDelegationToken: async () => 'fixture' }))
 vi.mock('@/lib/core/security/encryption', () => encryptionMock)
 vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock)
+vi.mock('@/lib/projects/membership', () => projectMembershipMock)
 vi.mock('@/lib/billing/storage', () => billingStorageMock)
 vi.mock('@/lib/uploads', () => uploadsMock)
 vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock)
@@ -137,6 +139,9 @@ const SOURCE = {
   key: `workspace/${WORKSPACE}/123-abc-source.txt`,
   userId: 'reader',
   workspaceId: WORKSPACE,
+  entityType: 'workspace',
+  entityId: WORKSPACE,
+  organizationId: null,
   folderId: null,
   context: 'workspace',
   chatId: null,
@@ -179,6 +184,7 @@ function queueRead(file: typeof SOURCE, provenance: WorkspaceFileSecretProvenanc
     {
       workspaceId: WORKSPACE,
       fileId: file.id,
+      ownership: file,
       workspaceOrganizationId: null,
       allowPersonalApiKeys: true,
       billedAccountUserId: 'owner',

apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-page.test.ts

@@ -1,5 +1,6 @@
-import { dbChainMockFns } from '@sim/testing'
+import { dbChainMockFns, resetDbChainMock } from '@sim/testing'
 import { billingStorageMock } from '@sim/testing/mocks/billing-storage.mock'
+import { projectMembershipMock } from '@sim/testing/mocks/project-membership.mock'
 import { realtimeNotifyMock } from '@sim/testing/mocks/realtime-notify.mock'
 import { storageServiceMock, storageServiceMockFns } from '@sim/testing/mocks/storage-service.mock'
 import { uploadsMock } from '@sim/testing/mocks/uploads.mock'
@@ -9,16 +10,7 @@ import {
 } from '@sim/testing/mocks/workspace-file-folders.mock'
 import { beforeEach, expect, it, vi } from 'vitest'
 
-const mocks = vi.hoisted(() => {
-  const values = vi.fn()
-  const insert = vi.fn(() => ({
-    values: (metadata: Record<string, unknown>) => {
-      values(metadata)
-      return { onConflictDoNothing: () => ({ returning: async () => [metadata] }) }
-    },
-  }))
-  return { values, insert }
-})
+vi.mock('@/lib/projects/membership', () => projectMembershipMock)
 vi.mock('@/lib/billing/storage', () => billingStorageMock)
 vi.mock('@/lib/folders/locks', () => ({ acquireFolderMutationLock: vi.fn() }))
 vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock)
@@ -41,11 +33,12 @@ workspaceFileFoldersMockFns.mockNormalizeWorkspaceFileItemName.mockImplementatio
 const mockUpload = storageServiceMockFns.mockUploadFile
 
 beforeEach(() => {
-  dbChainMockFns.transaction.mockImplementation(
-    async (run: (tx: { insert: typeof mocks.insert }) => Promise<unknown>) =>
-      run({ insert: mocks.insert })
-  )
-  mockUpload.mockImplementation(async ({ fileName }: { fileName: string }) => ({ key: fileName }))
+  resetDbChainMock()
+  dbChainMockFns.returning.mockImplementation(async () => {
+    const metadata = dbChainMockFns.values.mock.calls.at(-1)?.[0]
+    return metadata ? [metadata] : []
+  })
+  mockUpload.mockImplementation(async ({ customKey }) => ({ key: customKey }))
 })
 
 it('registers agent-authored Page source as a native Page and preserves editable source', async () => {
@@ -68,7 +61,7 @@ it('registers agent-authored Page source as a native Page and preserves editable
     type: SIM_PAGE_CONTENT_TYPE,
     size: bytes.length,
   })
-  expect(mocks.values).toHaveBeenCalledWith(
+  expect(dbChainMockFns.values).toHaveBeenCalledWith(
     expect.objectContaining({ originalName: 'Team handbook', contentType: SIM_PAGE_CONTENT_TYPE })
   )
   expect(mockUpload).toHaveBeenCalledWith(
@@ -83,7 +76,7 @@ it('keeps a complete HTML document as HTML rather than mislabeling it a native P
     exactName: true,
   })
   expect(file).toMatchObject({ name: 'report.html', type: 'text/html' })
-  expect(mocks.values).toHaveBeenCalledWith(
+  expect(dbChainMockFns.values).toHaveBeenCalledWith(
     expect.objectContaining({ originalName: 'report.html', contentType: 'text/html' })
   )
 })

apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-billing.test.ts

@@ -1,5 +1,6 @@
 import { dbChainMockFns, resetDbChainMock } from '@sim/testing'
 import { billingStorageMock, billingStorageMockFns } from '@sim/testing/mocks/billing-storage.mock'
+import { projectMembershipMock } from '@sim/testing/mocks/project-membership.mock'
 import { storageServiceMock, storageServiceMockFns } from '@sim/testing/mocks/storage-service.mock'
 import { uploadsMock, uploadsMockFns } from '@sim/testing/mocks/uploads.mock'
 import {
@@ -8,6 +9,7 @@ import {
 } from '@sim/testing/mocks/workspace-file-folders.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+vi.mock('@/lib/projects/membership', () => projectMembershipMock)
 vi.mock('@/lib/billing/storage', () => billingStorageMock)
 
 vi.mock('@/lib/uploads', () => uploadsMock)
@@ -52,19 +54,17 @@ describe('workspace file storage attribution', () => {
     mockResolveWorkspaceFileFolderTarget.mockResolvedValue(null)
     mockIncrementStorageUsageForBillingContextInTx.mockResolvedValue(5)
     mockMaybeNotifyStorageLimitForBillingContext.mockResolvedValue(undefined)
-    mockUploadFile.mockResolvedValue({
-      key: 'workspace/workspace-1/123-abc-note.txt',
-    })
+    mockUploadFile.mockImplementation(async ({ customKey }) => ({ key: customKey }))
   })
 
   it.each(['external-collaborator', 'personal-api-key-user'])(
     'charges the workspace payer while retaining %s as uploader metadata',
     async (actorUserId) => {
       dbChainMockFns.returning
-        .mockResolvedValueOnce([
+        .mockImplementationOnce(async () => [
           {
             id: 'file-1',
-            key: 'workspace/workspace-1/123-abc-note.txt',
+            key: mockUploadFile.mock.calls.at(-1)?.[0].customKey,
             userId: actorUserId,
             workspaceId: 'workspace-1',
             folderId: null,