mirror of
https://github.com/supabase/supabase.git
synced 2026-09-10 20:10:31 +08:00
Upgrades Vitest from 4.1.4 to 5.0.0 across the monorepo, fixes the handful of things v5 turned into hard errors, and drops the `vi.clearAllMocks()` boilerplate that v5's `clearMocks` default makes redundant. **Changed:** - `vitest`, `@vitest/ui`, `@vitest/coverage-v8` 4.1.4 → 5.0.0 (catalog) - `vi.mock` calls that lived inside `beforeAll`/`beforeEach`/test bodies moved to module scope (v5 throws on nested calls). Affects the Studio and docs setup files and four Studio tests. - `detectBrowser` test restores `navigator` via `vi.unstubAllGlobals()` instead of assigning `global.navigator`, which now reaches jsdom's getter-only property. - `RowEditor.utils.test.ts` restores its `JSON.stringify` spy. It used to leak a throwing mock for the rest of the file, which v5's coverage provider now trips over. A later test in the same file had been asserting the leak's side effect (valid JSON reported as invalid) and now asserts the correct behavior. - `@testing-library/jest-dom` 6.6 → 7.0.1. Its vitest type augmentation resolves through a peer now, so it lands on each package's own `vitest` instead of whichever copy pnpm hoisted. Fixes `toBeInTheDocument` type errors in dev-tools after the reshuffle. - `@testing-library/react` 16.0.0 → 16.3.3 for the React 19 peer range. - `vite: catalog:` added to dev-tools, www, and common. Without it they resolved a newer vite than the catalog pin, which forked a second vitest instance in the lockfile. There's now one. - ai-commands custom matcher types use v5's `Matchers<R, T>` form. - 110 test files: `vi.clearAllMocks()` removed from `beforeEach`/`afterEach` hooks, along with hooks that only did that and the imports they left unused. Calls that also reset/restore mocks are untouched. Second commit, mechanical. **Added:** - `.vitest/` to the root gitignore (v5 writes JSON/JUnit/HTML reporter output there) **Removed:** - `vite-tsconfig-paths` catalog entry and deps. Vitest 5 resolves tsconfig paths itself. Release-age note: this sat in draft with a temporary `minimumReleaseAgeExclude` entry for `vitest` and `@vitest/*` while 5.0.0 was inside the workspace's 3-day `minimumReleaseAge` window. That window has closed, so the exclusion is gone and nothing bypasses the release-age gate. **Perf** (local, medians of 3 runs, same machine): | Suite | v4.1.4 | v5.0.0 | |---|---|---| | studio | 144.1s | 141.7s (-2%) | | studio `--coverage` | 156.9s | 146.4s (-7%) | | ui-patterns | 6.27s | 5.07s (-19%) | | ui `--coverage` | 3.35s | 2.14s (-36%) | | www | 0.89s | 0.47s (-47%) | Studio is dominated by jsdom environment setup per file, which v5 doesn't change. `vitest doctor` recommends keeping the current pool config: the vm pools and `isolate: false` all break tests. ## To test - `pnpm install --frozen-lockfile` succeeds with no `minimumReleaseAgeExclude` entry for vitest. - CI: Studio unit tests, ui, ui-patterns, www, docs, and typecheck/lint should all be green. The lint ratchet was checked locally: warning counts on touched Studio files are identical to master. - `pnpm test:studio` locally passes with coverage (588 files, 6240 tests). - Open a Studio test that uses `toBeInTheDocument` in your editor and confirm no type errors on jest-dom matchers, in Studio and in `packages/dev-tools`. - Known pre-existing failures unrelated to this PR: one dev-tools test (`getEventCountBadge` capped pill) fails on master too. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Tests - Improved test coverage for JSON validation and mobile navigation behavior. - Updated test setup, cleanup, environment configuration, and matcher support across application and shared package suites. - Removed obsolete coverage for alternate MCP transport selection. ## Chores - Streamlined TypeScript path resolution and Vitest reporter output handling. - Updated testing libraries and Vitest tooling across documentation, Studio, website, and shared packages. - Added Vitest reporter output to ignored files. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com> Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com>
121 lines
4.3 KiB
TypeScript
121 lines
4.3 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { createSupabaseMCPClient } from '../supabase-mcp'
|
|
import { getMcpTools } from './mcp-tools'
|
|
|
|
vi.mock('../supabase-mcp', () => ({
|
|
createSupabaseMCPClient: vi.fn(),
|
|
}))
|
|
|
|
const BASE_PARAMS = {
|
|
accessToken: 'token',
|
|
projectRef: 'abcdefghijklmnopqrst',
|
|
aiOptInLevel: 'schema_and_log_and_data' as const,
|
|
// A fresh, non-aborted signal by default; lifecycle tests override it
|
|
signal: new AbortController().signal,
|
|
}
|
|
|
|
// A realistic remote tool set: all expected read tools plus the UI-executed ones
|
|
const FULL_REMOTE_TOOLS = {
|
|
search_docs: { description: 'docs' },
|
|
list_tables: { description: 'list tables' },
|
|
list_extensions: { description: 'extensions' },
|
|
list_edge_functions: { description: 'edge functions' },
|
|
list_branches: { description: 'branches' },
|
|
get_advisors: { description: 'advisors' },
|
|
query_logs: { description: 'query logs' },
|
|
execute_sql: { description: 'execute sql' },
|
|
deploy_edge_function: { description: 'deploy' },
|
|
}
|
|
|
|
describe('ai/tools/mcp-tools getMcpTools', () => {
|
|
let close: ReturnType<typeof vi.fn>
|
|
let tools: ReturnType<typeof vi.fn>
|
|
let consoleErrorSpy: ReturnType<typeof vi.spyOn>
|
|
|
|
beforeEach(() => {
|
|
consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
|
|
close = vi.fn().mockResolvedValue(undefined)
|
|
tools = vi.fn().mockResolvedValue({ ...FULL_REMOTE_TOOLS })
|
|
vi.mocked(createSupabaseMCPClient).mockResolvedValue({ tools, close } as any)
|
|
})
|
|
|
|
afterEach(() => {
|
|
consoleErrorSpy.mockRestore()
|
|
})
|
|
|
|
it('returns MCP tools and strips UI-executed tools handled locally', async () => {
|
|
const result = await getMcpTools(BASE_PARAMS)
|
|
|
|
expect(result).toHaveProperty('list_tables')
|
|
expect(result).toHaveProperty('query_logs')
|
|
expect(result).not.toHaveProperty('execute_sql')
|
|
expect(result).not.toHaveProperty('deploy_edge_function')
|
|
})
|
|
|
|
it('warns when the remote server is missing an expected tool (contract drift)', async () => {
|
|
const { list_branches, ...withoutBranches } = FULL_REMOTE_TOOLS
|
|
tools.mockResolvedValueOnce(withoutBranches)
|
|
|
|
await getMcpTools(BASE_PARAMS)
|
|
|
|
expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('list_branches'))
|
|
})
|
|
|
|
it('does not warn about drift when all expected tools are present', async () => {
|
|
await getMcpTools(BASE_PARAMS)
|
|
|
|
const driftWarnings = consoleErrorSpy.mock.calls.filter(
|
|
([msg]: unknown[]) => typeof msg === 'string' && msg.includes('missing expected tools')
|
|
)
|
|
expect(driftWarnings).toHaveLength(0)
|
|
})
|
|
|
|
it('keeps the connection open until the request signal aborts', async () => {
|
|
const controller = new AbortController()
|
|
|
|
await getMcpTools({ ...BASE_PARAMS, signal: controller.signal })
|
|
// Tools execute later during streaming, so the client must stay open
|
|
expect(close).not.toHaveBeenCalled()
|
|
|
|
controller.abort()
|
|
await Promise.resolve()
|
|
expect(close).toHaveBeenCalledTimes(1)
|
|
})
|
|
|
|
it('closes the client and skips fetching tools when the signal is already aborted', async () => {
|
|
const controller = new AbortController()
|
|
controller.abort()
|
|
|
|
const result = await getMcpTools({ ...BASE_PARAMS, signal: controller.signal })
|
|
|
|
expect(close).toHaveBeenCalledTimes(1)
|
|
expect(tools).not.toHaveBeenCalled()
|
|
expect(result).toEqual({})
|
|
})
|
|
|
|
it('closes the client and rethrows when fetching tools fails, without double-closing on later abort', async () => {
|
|
tools.mockRejectedValueOnce(new Error('network unreachable'))
|
|
const controller = new AbortController()
|
|
|
|
await expect(getMcpTools({ ...BASE_PARAMS, signal: controller.signal })).rejects.toThrow(
|
|
'network unreachable'
|
|
)
|
|
expect(close).toHaveBeenCalledTimes(1)
|
|
|
|
// A subsequent abort must not close the (already closed) client again
|
|
controller.abort()
|
|
await Promise.resolve()
|
|
expect(close).toHaveBeenCalledTimes(1)
|
|
})
|
|
|
|
it('closes the client and rethrows when tool validation fails', async () => {
|
|
// A known tool name with a non-object value passes the opt-in filter but
|
|
// fails schema validation
|
|
tools.mockResolvedValueOnce({ ...FULL_REMOTE_TOOLS, list_tables: 'not-an-object' })
|
|
|
|
await expect(getMcpTools(BASE_PARAMS)).rejects.toThrow('MCP tools validation failed')
|
|
expect(close).toHaveBeenCalledTimes(1)
|
|
})
|
|
})
|