mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03: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>
286 lines
9.1 KiB
TypeScript
286 lines
9.1 KiB
TypeScript
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import type { ComponentProps } from 'react'
|
|
import { toast } from 'sonner'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { LogDrainDestinationSheetForm } from './LogDrainDestinationSheetForm'
|
|
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
|
|
import { render } from '@/tests/helpers'
|
|
|
|
const { mockShortcut, trackMock, useFlagMock, useLogDrainsQueryMock, useParamsMock, useTrackMock } =
|
|
vi.hoisted(() => ({
|
|
mockShortcut: vi.fn(({ children }: any) => <div data-testid="shortcut">{children}</div>),
|
|
trackMock: vi.fn(),
|
|
useFlagMock: vi.fn(),
|
|
useLogDrainsQueryMock: vi.fn(),
|
|
useParamsMock: vi.fn(),
|
|
useTrackMock: vi.fn(),
|
|
}))
|
|
|
|
vi.mock(import('common'), async (importOriginal) => {
|
|
const actual = await importOriginal()
|
|
|
|
return {
|
|
...actual,
|
|
IS_PLATFORM: false,
|
|
useFlag: useFlagMock,
|
|
useParams: useParamsMock,
|
|
}
|
|
})
|
|
|
|
vi.mock(import('@/data/log-drains/log-drains-query'), async (importOriginal) => {
|
|
const actual = await importOriginal()
|
|
|
|
return {
|
|
...actual,
|
|
useLogDrainsQuery: useLogDrainsQueryMock,
|
|
}
|
|
})
|
|
|
|
vi.mock('@/lib/telemetry/track', () => ({
|
|
useTrack: useTrackMock,
|
|
}))
|
|
|
|
vi.mock('@/components/ui/Shortcut', () => ({
|
|
Shortcut: mockShortcut,
|
|
}))
|
|
|
|
vi.mock('sonner', () => ({
|
|
toast: {
|
|
error: vi.fn(),
|
|
success: vi.fn(),
|
|
},
|
|
}))
|
|
|
|
const renderForm = (props?: Partial<ComponentProps<typeof LogDrainDestinationSheetForm>>) => {
|
|
const onOpenChange = vi.fn()
|
|
const onSubmit = vi.fn()
|
|
|
|
render(
|
|
<LogDrainDestinationSheetForm
|
|
open
|
|
mode="create"
|
|
isLoading={false}
|
|
onOpenChange={onOpenChange}
|
|
onSubmit={onSubmit}
|
|
defaultValues={{ type: 'webhook' }}
|
|
{...props}
|
|
/>
|
|
)
|
|
|
|
return { onOpenChange, onSubmit }
|
|
}
|
|
|
|
const submitForm = () =>
|
|
fireEvent.submit(document.getElementById('log-drain-destination-form') as HTMLFormElement)
|
|
|
|
describe('LogDrainDestinationSheetForm', () => {
|
|
beforeEach(() => {
|
|
useFlagMock.mockReturnValue(true)
|
|
useParamsMock.mockReturnValue({ ref: 'project-ref' })
|
|
useLogDrainsQueryMock.mockReturnValue({ data: [] })
|
|
useTrackMock.mockReturnValue(trackMock)
|
|
})
|
|
|
|
it('does not prefill a Content-Type header for webhook create mode', async () => {
|
|
renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
expect(screen.queryByDisplayValue('Content-Type')).not.toBeInTheDocument()
|
|
expect(screen.queryByDisplayValue('application/json')).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('wraps the save button with the save destination shortcut while open', async () => {
|
|
renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
expect(mockShortcut).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
id: SHORTCUT_IDS.LOG_DRAINS_SAVE_DESTINATION,
|
|
onTrigger: expect.any(Function),
|
|
options: { enabled: true },
|
|
side: 'top',
|
|
}),
|
|
undefined
|
|
)
|
|
expect(screen.getByRole('button', { name: 'Save destination' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('blocks submission when the destination name matches an existing drain', async () => {
|
|
const user = userEvent.setup()
|
|
const { onSubmit } = renderForm({ existingDrainNames: ['existing-drain'] })
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'existing-drain')
|
|
submitForm()
|
|
|
|
await waitFor(() => expect(toast.error).toHaveBeenCalledWith('Log drain name already exists'))
|
|
expect(onSubmit).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('invokes onSaveClick with the destination type when saving', async () => {
|
|
const user = userEvent.setup()
|
|
const onSaveClick = vi.fn()
|
|
const { onSubmit } = renderForm({ onSaveClick })
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'Webhook sink')
|
|
await user.type(
|
|
screen.getByPlaceholderText('https://example.com/log-drain'),
|
|
'https://logs.example.com/ingest'
|
|
)
|
|
submitForm()
|
|
|
|
await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1))
|
|
expect(onSaveClick).toHaveBeenCalledWith('webhook')
|
|
})
|
|
|
|
it('shows the protobuf content type header for OTLP create mode', async () => {
|
|
renderForm({
|
|
defaultValues: { type: 'otlp' },
|
|
})
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
expect(screen.getByDisplayValue('Content-Type')).toBeInTheDocument()
|
|
expect(screen.getByDisplayValue('application/x-protobuf')).toBeInTheDocument()
|
|
})
|
|
|
|
it('submits headers as a record without leaking the internal headerEntries field', async () => {
|
|
const user = userEvent.setup()
|
|
const { onSubmit } = renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'Webhook sink')
|
|
await user.type(
|
|
screen.getByPlaceholderText('https://example.com/log-drain'),
|
|
'https://logs.example.com/ingest'
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Add a new header' }))
|
|
|
|
const headerNameInputs = screen.getAllByPlaceholderText('Header name')
|
|
const headerValueInputs = screen.getAllByPlaceholderText('Header value')
|
|
|
|
await user.type(headerNameInputs[0], 'X-API-Key')
|
|
await user.type(headerValueInputs[0], 'secret-key')
|
|
|
|
submitForm()
|
|
|
|
await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1))
|
|
expect(onSubmit).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
type: 'webhook',
|
|
headers: {
|
|
'X-API-Key': 'secret-key',
|
|
},
|
|
})
|
|
)
|
|
expect(onSubmit.mock.calls[0][0]).not.toHaveProperty('headerEntries')
|
|
})
|
|
|
|
it('rejects duplicate header names with an inline field error', async () => {
|
|
const user = userEvent.setup()
|
|
const { onSubmit } = renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'Webhook sink')
|
|
await user.type(
|
|
screen.getByPlaceholderText('https://example.com/log-drain'),
|
|
'https://logs.example.com/ingest'
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Add a new header' }))
|
|
await user.click(screen.getByRole('button', { name: 'Add a new header' }))
|
|
|
|
const headerNameInputs = screen.getAllByPlaceholderText('Header name')
|
|
const headerValueInputs = screen.getAllByPlaceholderText('Header value')
|
|
|
|
await user.type(headerNameInputs[0], 'X-Custom')
|
|
await user.type(headerValueInputs[0], 'one')
|
|
await user.type(headerNameInputs[1], 'X-Custom')
|
|
await user.type(headerValueInputs[1], 'two')
|
|
|
|
submitForm()
|
|
|
|
expect((await screen.findAllByText('Header name already exists')).length).toBeGreaterThan(0)
|
|
expect(onSubmit).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('allows fully empty header rows without blocking submit', async () => {
|
|
const user = userEvent.setup()
|
|
const { onSubmit } = renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'Webhook sink')
|
|
await user.type(
|
|
screen.getByPlaceholderText('https://example.com/log-drain'),
|
|
'https://logs.example.com/ingest'
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Add a new header' }))
|
|
|
|
submitForm()
|
|
|
|
await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1))
|
|
expect(onSubmit).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
type: 'webhook',
|
|
})
|
|
)
|
|
expect(onSubmit.mock.calls[0][0]).not.toHaveProperty('headers')
|
|
expect(screen.queryByText('undefined')).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('shows an inline value error when a header key is entered without a value', async () => {
|
|
const user = userEvent.setup()
|
|
const { onSubmit } = renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'Webhook sink')
|
|
await user.type(
|
|
screen.getByPlaceholderText('https://example.com/log-drain'),
|
|
'https://logs.example.com/ingest'
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Add a new header' }))
|
|
|
|
const headerNameInputs = screen.getAllByPlaceholderText('Header name')
|
|
await user.type(headerNameInputs[0], 'X-Draft-Only')
|
|
|
|
submitForm()
|
|
|
|
expect(await screen.findByText('Header value is required')).toBeInTheDocument()
|
|
expect(onSubmit).not.toHaveBeenCalled()
|
|
expect(screen.queryByText('undefined')).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('shows an inline key error when a header value is entered without a key', async () => {
|
|
const user = userEvent.setup()
|
|
const { onSubmit } = renderForm()
|
|
|
|
await screen.findByRole('dialog')
|
|
|
|
await user.type(screen.getByPlaceholderText('My Destination'), 'Webhook sink')
|
|
await user.type(
|
|
screen.getByPlaceholderText('https://example.com/log-drain'),
|
|
'https://logs.example.com/ingest'
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Add a new header' }))
|
|
|
|
const headerValueInputs = screen.getAllByPlaceholderText('Header value')
|
|
await user.type(headerValueInputs[0], 'draft-value')
|
|
|
|
submitForm()
|
|
|
|
expect(await screen.findByText('Header name is required')).toBeInTheDocument()
|
|
expect(onSubmit).not.toHaveBeenCalled()
|
|
expect(screen.queryByText('undefined')).not.toBeInTheDocument()
|
|
})
|
|
})
|