mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 01:45: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>
191 lines
6.1 KiB
TypeScript
191 lines
6.1 KiB
TypeScript
/* eslint-disable turbo/no-undeclared-env-vars */
|
|
|
|
import { createClient } from '@supabase/supabase-js'
|
|
import { revalidateTag } from 'next/cache'
|
|
import { headers } from 'next/headers'
|
|
import { NextRequest } from 'next/server'
|
|
import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
|
|
|
|
import { _handleRevalidateRequest } from './route.utils'
|
|
|
|
// Mock Next.js modules
|
|
vi.mock('next/cache', () => ({
|
|
revalidateTag: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('next/headers', () => ({
|
|
headers: vi.fn(),
|
|
}))
|
|
|
|
// Mock Supabase client
|
|
vi.mock('@supabase/supabase-js', () => ({
|
|
createClient: vi.fn(),
|
|
}))
|
|
|
|
describe('_handleRevalidateRequest', () => {
|
|
let mockDate: Date
|
|
let originalEnv: NodeJS.ProcessEnv
|
|
let mockSupabaseClient: {
|
|
rpc: Mock
|
|
from: Mock
|
|
}
|
|
|
|
beforeEach(() => {
|
|
// Store the original environment
|
|
originalEnv = { ...process.env }
|
|
|
|
// Mock environment variables
|
|
process.env.DOCS_REVALIDATION_KEYS = 'basic_key'
|
|
process.env.DOCS_REVALIDATION_OVERRIDE_KEYS = 'override_key,other_override_key'
|
|
process.env.NEXT_PUBLIC_SUPABASE_URL = 'http://localhost:3000'
|
|
process.env.SUPABASE_SECRET_KEY = 'secret_key'
|
|
|
|
// Silence intentional console errors for cleaner test output
|
|
vi.spyOn(console, 'error').mockImplementation(() => {})
|
|
|
|
// Mock current date
|
|
mockDate = new Date('2023-01-01T12:00:00Z')
|
|
vi.setSystemTime(mockDate)
|
|
|
|
// Setup mock Supabase client
|
|
mockSupabaseClient = {
|
|
rpc: vi.fn(),
|
|
from: vi.fn(() => ({
|
|
insert: vi.fn().mockResolvedValue({ error: null }),
|
|
})),
|
|
}
|
|
vi.mocked(createClient).mockReturnValue(mockSupabaseClient as any)
|
|
})
|
|
|
|
afterEach(() => {
|
|
process.env = originalEnv
|
|
vi.useRealTimers()
|
|
})
|
|
|
|
it('should return 401 if Authorization header is missing', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(401)
|
|
expect(await response.text()).toBe('Missing Authorization header')
|
|
})
|
|
|
|
it('should return 401 if Authorization header is invalid', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
headers: {
|
|
Authorization: 'Bearer invalid_token',
|
|
},
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(401)
|
|
expect(await response.text()).toBe('Invalid Authorization header')
|
|
})
|
|
|
|
it('should return 400 if request body is malformed', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
headers: {
|
|
Authorization: 'Bearer basic_key',
|
|
},
|
|
body: JSON.stringify({ invalid: 'body' }),
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(400)
|
|
expect(await response.text()).toContain('Malformed request body')
|
|
})
|
|
|
|
it('should revalidate tags if request is valid with basic permissions', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
headers: {
|
|
Authorization: 'Bearer basic_key',
|
|
},
|
|
body: JSON.stringify({ tags: ['graphql', 'wrappers'] }),
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
mockSupabaseClient.rpc.mockResolvedValue({ data: [] })
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(204)
|
|
expect(revalidateTag).toHaveBeenCalledTimes(2)
|
|
expect(revalidateTag).toHaveBeenCalledWith('graphql')
|
|
expect(revalidateTag).toHaveBeenCalledWith('wrappers')
|
|
})
|
|
|
|
it('should return 429 if last revalidation was less than 6 hours ago with basic permissions', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
headers: {
|
|
Authorization: 'Bearer basic_key',
|
|
},
|
|
body: JSON.stringify({ tags: ['graphql'] }),
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
const fiveHoursAgo = new Date(mockDate.getTime() - 5 * 60 * 60 * 1000)
|
|
mockSupabaseClient.rpc.mockResolvedValue({
|
|
data: [{ created_at: fiveHoursAgo.toISOString() }],
|
|
})
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(429)
|
|
expect(await response.text()).toContain('revalidated within the last 6 hours')
|
|
})
|
|
|
|
it('should revalidate if last revalidation was more than 6 hours ago with basic permissions', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
headers: {
|
|
Authorization: 'Bearer basic_key',
|
|
},
|
|
body: JSON.stringify({ tags: ['graphql'] }),
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
const sevenHoursAgo = new Date(mockDate.getTime() - 7 * 60 * 60 * 1000)
|
|
mockSupabaseClient.rpc.mockResolvedValue({
|
|
data: [{ created_at: sevenHoursAgo.toISOString() }],
|
|
})
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(204)
|
|
expect(revalidateTag).toHaveBeenCalledWith('graphql')
|
|
})
|
|
|
|
it('should revalidate regardless of last revalidation time with override permissions', async () => {
|
|
const request = new NextRequest('https://example.com', {
|
|
method: 'POST',
|
|
headers: {
|
|
Authorization: 'Bearer override_key',
|
|
},
|
|
body: JSON.stringify({ tags: ['graphql'] }),
|
|
})
|
|
|
|
vi.mocked(headers).mockReturnValue(Promise.resolve(new Headers(request.headers)))
|
|
|
|
const oneHourAgo = new Date(mockDate.getTime() - 1 * 60 * 60 * 1000)
|
|
mockSupabaseClient.rpc.mockResolvedValue({
|
|
data: [{ created_at: oneHourAgo.toISOString() }],
|
|
})
|
|
|
|
const response = await _handleRevalidateRequest(request)
|
|
expect(response.status).toBe(204)
|
|
expect(revalidateTag).toHaveBeenCalledWith('graphql')
|
|
})
|
|
})
|