mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 09:55:06 +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>
277 lines
9.0 KiB
TypeScript
277 lines
9.0 KiB
TypeScript
import { screen, waitFor, within } from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import { toast } from 'sonner'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { TEMPLATES_SCHEMAS } from './AuthTemplatesValidation'
|
|
import { TemplateEditor } from './TemplateEditor'
|
|
import { render } from '@/tests/helpers'
|
|
|
|
const {
|
|
resetTemplateMock,
|
|
updateAuthConfigMock,
|
|
useAuthConfigQueryMock,
|
|
useAuthTemplateResetMutationMock,
|
|
useAuthConfigUpdateMutationMock,
|
|
useAsyncCheckPermissionsMock,
|
|
validateSpamMock,
|
|
} = vi.hoisted(() => ({
|
|
resetTemplateMock: vi.fn(),
|
|
updateAuthConfigMock: vi.fn(),
|
|
useAuthConfigQueryMock: vi.fn(),
|
|
useAuthTemplateResetMutationMock: vi.fn(),
|
|
useAuthConfigUpdateMutationMock: vi.fn(),
|
|
useAsyncCheckPermissionsMock: vi.fn(),
|
|
validateSpamMock: vi.fn(),
|
|
}))
|
|
|
|
vi.mock(import('common'), async (importOriginal) => {
|
|
const actual = await importOriginal()
|
|
|
|
return {
|
|
...actual,
|
|
useParams: vi.fn().mockReturnValue({ ref: 'project-ref' }),
|
|
}
|
|
})
|
|
|
|
vi.mock('@/components/ui/CodeEditor/CodeEditor', () => ({
|
|
CodeEditor: ({
|
|
value,
|
|
onInputChange,
|
|
}: {
|
|
value: string
|
|
onInputChange: (value: string) => void
|
|
}) => (
|
|
<textarea
|
|
aria-label="Body source"
|
|
value={value}
|
|
onChange={(event) => onInputChange(event.target.value)}
|
|
/>
|
|
),
|
|
}))
|
|
|
|
vi.mock('@/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges', () => ({
|
|
PreventNavigationOnUnsavedChanges: () => null,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/auth-config-query', () => ({
|
|
useAuthConfigQuery: useAuthConfigQueryMock,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/auth-config-update-mutation', () => ({
|
|
useAuthConfigUpdateMutation: useAuthConfigUpdateMutationMock,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/auth-template-reset-mutation', () => ({
|
|
useAuthTemplateResetMutation: useAuthTemplateResetMutationMock,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/validate-spam-mutation', () => ({
|
|
useValidateSpamMutation: () => ({ mutate: validateSpamMock }),
|
|
}))
|
|
|
|
vi.mock('@/hooks/misc/useCheckPermissions', () => ({
|
|
useAsyncCheckPermissions: useAsyncCheckPermissionsMock,
|
|
}))
|
|
|
|
vi.mock('sonner', () => ({
|
|
toast: {
|
|
success: vi.fn(),
|
|
error: vi.fn(),
|
|
},
|
|
}))
|
|
|
|
const confirmationTemplate = TEMPLATES_SCHEMAS.find((template) => template.id === 'CONFIRMATION')!
|
|
|
|
const createAuthConfig = ({
|
|
subject = 'Confirm your email address',
|
|
body,
|
|
hasCustomBody,
|
|
hasCustomSubject = false,
|
|
}: {
|
|
subject?: string
|
|
body: string
|
|
hasCustomBody: boolean
|
|
hasCustomSubject?: boolean
|
|
}) => ({
|
|
MAILER_SUBJECTS_CONFIRMATION: subject,
|
|
MAILER_SUBJECTS_CUSTOM_CONTENTS: {
|
|
MAILER_SUBJECTS_CONFIRMATION: hasCustomSubject,
|
|
},
|
|
MAILER_TEMPLATES_CONFIRMATION_CONTENT: body,
|
|
MAILER_TEMPLATES_CUSTOM_CONTENTS: {
|
|
MAILER_TEMPLATES_CONFIRMATION_CONTENT: hasCustomBody,
|
|
},
|
|
SMTP_HOST: 'smtp.example.com',
|
|
SMTP_PASS: 'password',
|
|
SMTP_USER: 'user',
|
|
})
|
|
|
|
const renderTemplateEditor = ({
|
|
body = '<p>Default template</p>',
|
|
canUpdateConfig = true,
|
|
hasCustomBody = false,
|
|
hasCustomSubject = false,
|
|
}: {
|
|
body?: string
|
|
canUpdateConfig?: boolean
|
|
hasCustomBody?: boolean
|
|
hasCustomSubject?: boolean
|
|
} = {}) => {
|
|
useAuthConfigQueryMock.mockReturnValue({
|
|
data: createAuthConfig({ body, hasCustomBody, hasCustomSubject }),
|
|
isSuccess: true,
|
|
})
|
|
useAsyncCheckPermissionsMock.mockReturnValue({ can: canUpdateConfig })
|
|
useAuthConfigUpdateMutationMock.mockReturnValue({ mutate: updateAuthConfigMock })
|
|
useAuthTemplateResetMutationMock.mockImplementation((options = {}) => ({
|
|
mutateAsync: (vars: unknown) => resetTemplateMock(vars, options),
|
|
isPending: false,
|
|
}))
|
|
|
|
return render(<TemplateEditor template={confirmationTemplate} />)
|
|
}
|
|
|
|
describe('TemplateEditor reset to default', () => {
|
|
beforeEach(() => {
|
|
validateSpamMock.mockImplementation((_vars, callbacks) => callbacks?.onSuccess?.({ rules: [] }))
|
|
})
|
|
|
|
const resetAuthConfig = createAuthConfig({
|
|
subject: 'Confirm your email address',
|
|
body: '<h2>Confirm your email address</h2>\n\n<p>Follow the link below to confirm this email address and finish signing up.</p>\n<p><a href="{{ .ConfirmationURL }}">Confirm email address</a></p>',
|
|
hasCustomBody: false,
|
|
hasCustomSubject: false,
|
|
})
|
|
|
|
it('hides reset when the API does not mark the body as custom', () => {
|
|
renderTemplateEditor()
|
|
|
|
expect(screen.queryByRole('button', { name: 'Reset template' })).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('shows reset when the API marks the body as custom', () => {
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('shows reset when the API marks the subject as custom', () => {
|
|
renderTemplateEditor({ hasCustomSubject: true })
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('keeps reset visible while there are unsaved editor changes', async () => {
|
|
const user = userEvent.setup()
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.clear(screen.getByLabelText('Body source'))
|
|
await user.type(screen.getByLabelText('Body source'), '<p>Unsaved body</p>')
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('warns that reset discards unsaved changes', async () => {
|
|
const user = userEvent.setup()
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.clear(screen.getByLabelText('Body source'))
|
|
await user.type(screen.getByLabelText('Body source'), '<p>Unsaved body</p>')
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
|
|
expect(
|
|
await screen.findByText(
|
|
'This will discard your unsaved changes and use the default subject line and email body content.'
|
|
)
|
|
).toBeInTheDocument()
|
|
})
|
|
|
|
it('resets the template through the dedicated reset endpoint after confirmation', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation((_vars, callbacks) =>
|
|
callbacks?.onSuccess?.(resetAuthConfig)
|
|
)
|
|
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
await waitFor(() =>
|
|
expect(resetTemplateMock).toHaveBeenCalledWith(
|
|
{ projectRef: 'project-ref', template: 'confirmation' },
|
|
expect.any(Object)
|
|
)
|
|
)
|
|
|
|
expect(toast.success).toHaveBeenCalledWith('Email template reset to default')
|
|
})
|
|
|
|
it('does not reset through the auth config update payload', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation((_vars, callbacks) =>
|
|
callbacks?.onSuccess?.(resetAuthConfig)
|
|
)
|
|
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
await waitFor(() => expect(resetTemplateMock).toHaveBeenCalled())
|
|
|
|
expect(updateAuthConfigMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('uses the reset response as the new editor state', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation((_vars, callbacks) =>
|
|
callbacks?.onSuccess?.(resetAuthConfig)
|
|
)
|
|
|
|
renderTemplateEditor({
|
|
body: '<p>Custom body</p>',
|
|
hasCustomBody: true,
|
|
hasCustomSubject: true,
|
|
})
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
await waitFor(() => {
|
|
expect(screen.getByDisplayValue('Confirm your email address')).toBeInTheDocument()
|
|
expect(screen.getByLabelText('Body source')).toHaveValue(
|
|
'<h2>Confirm your email address</h2>\n\n<p>Follow the link below to confirm this email address and finish signing up.</p>\n<p><a href="{{ .ConfirmationURL }}">Confirm email address</a></p>'
|
|
)
|
|
})
|
|
})
|
|
|
|
it('disables reset when the user cannot update auth config', () => {
|
|
renderTemplateEditor({ hasCustomBody: true, canUpdateConfig: false })
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeDisabled()
|
|
})
|
|
|
|
it('keeps the dialog open and shows an inline error when reset fails', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation(async () => {
|
|
throw new Error('Reset endpoint unavailable')
|
|
})
|
|
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
expect(await within(dialog).findByText('Reset endpoint unavailable')).toBeInTheDocument()
|
|
expect(within(dialog).getByText('Unable to reset email template')).toBeInTheDocument()
|
|
expect(within(dialog).getByRole('button', { name: 'Reset' })).toBeInTheDocument()
|
|
expect(toast.error).not.toHaveBeenCalled()
|
|
})
|
|
})
|