mirror of
https://github.com/supabase/supabase.git
synced 2026-09-22 13:37:53 +08:00
1966209483
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>
127 lines
4.4 KiB
TypeScript
127 lines
4.4 KiB
TypeScript
import * as configcat from '@configcat/sdk/node'
|
|
import type { IConfigCatClient } from '@configcat/sdk/node'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
vi.mock('@configcat/sdk/node', () => ({
|
|
getClient: vi.fn(),
|
|
PollingMode: {
|
|
LazyLoad: 'LazyLoad',
|
|
},
|
|
User: vi.fn(),
|
|
}))
|
|
|
|
describe('lib/server/configcat getServerFlags', () => {
|
|
const mockClient = {
|
|
getAllValuesAsync: vi.fn(),
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.resetModules()
|
|
vi.unstubAllEnvs()
|
|
vi.mocked(configcat.getClient).mockReturnValue(mockClient as unknown as IConfigCatClient)
|
|
})
|
|
|
|
it('should return empty array and skip getClient when no env vars are present', async () => {
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
const result = await getServerFlags(trustedUserEmail('test@example.com'))
|
|
|
|
expect(result).toEqual([])
|
|
expect(configcat.getClient).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should prefer the proxy over the direct SDK key when both are configured', async () => {
|
|
vi.stubEnv('NEXT_PUBLIC_CONFIGCAT_SDK_KEY', 'test-sdk-key')
|
|
vi.stubEnv('NEXT_PUBLIC_CONFIGCAT_PROXY_URL', 'https://proxy.example.com')
|
|
mockClient.getAllValuesAsync.mockResolvedValue([])
|
|
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
await getServerFlags(trustedUserEmail('test@example.com'))
|
|
|
|
expect(configcat.getClient).toHaveBeenCalledTimes(1)
|
|
expect(configcat.getClient).toHaveBeenCalledWith('configcat-proxy/frontend-v2', 'LazyLoad', {
|
|
baseUrl: 'https://proxy.example.com',
|
|
})
|
|
})
|
|
|
|
it('should fall back to the direct SDK key when no proxy URL is configured', async () => {
|
|
vi.stubEnv('NEXT_PUBLIC_CONFIGCAT_SDK_KEY', 'test-sdk-key')
|
|
mockClient.getAllValuesAsync.mockResolvedValue([])
|
|
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
await getServerFlags(trustedUserEmail('test@example.com'))
|
|
|
|
expect(configcat.getClient).toHaveBeenCalledWith('test-sdk-key', 'LazyLoad')
|
|
})
|
|
|
|
it('should call getAllValuesAsync with a user built from the given email', async () => {
|
|
vi.stubEnv('NEXT_PUBLIC_CONFIGCAT_SDK_KEY', 'test-sdk-key')
|
|
const mockValues = [{ settingKey: 'explorer', settingValue: true }]
|
|
mockClient.getAllValuesAsync.mockResolvedValue(mockValues)
|
|
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
const result = await getServerFlags(trustedUserEmail('test@example.com'))
|
|
|
|
expect(configcat.User).toHaveBeenCalledWith(
|
|
'test@example.com',
|
|
undefined,
|
|
undefined,
|
|
expect.any(Object)
|
|
)
|
|
expect(result).toEqual(mockValues)
|
|
})
|
|
|
|
it('reuses the same client across calls instead of creating a new one each time', async () => {
|
|
vi.stubEnv('NEXT_PUBLIC_CONFIGCAT_SDK_KEY', 'test-sdk-key')
|
|
mockClient.getAllValuesAsync.mockResolvedValue([])
|
|
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
await getServerFlags(trustedUserEmail('a@example.com'))
|
|
await getServerFlags(trustedUserEmail('b@example.com'))
|
|
|
|
expect(configcat.getClient).toHaveBeenCalledTimes(1)
|
|
})
|
|
|
|
describe('is_staff targeting attribute', () => {
|
|
beforeEach(() => {
|
|
vi.stubEnv('NEXT_PUBLIC_CONFIGCAT_SDK_KEY', 'test-sdk-key')
|
|
mockClient.getAllValuesAsync.mockResolvedValue([])
|
|
})
|
|
|
|
it('is true for a real @supabase.com/@supabase.io email', async () => {
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
await getServerFlags(trustedUserEmail('person@supabase.io'))
|
|
|
|
expect(configcat.User).toHaveBeenCalledWith(
|
|
'person@supabase.io',
|
|
undefined,
|
|
undefined,
|
|
expect.objectContaining({ is_staff: 'true' })
|
|
)
|
|
})
|
|
|
|
it('is false for a domain that merely contains "@supabase." as a substring', async () => {
|
|
const { getServerFlags, trustedUserEmail } = await import('./configcat')
|
|
await getServerFlags(trustedUserEmail('attacker@supabase.evil.com'))
|
|
|
|
expect(configcat.User).toHaveBeenCalledWith(
|
|
'attacker@supabase.evil.com',
|
|
undefined,
|
|
undefined,
|
|
expect.objectContaining({ is_staff: 'false' })
|
|
)
|
|
})
|
|
|
|
it('is false when no email is given', async () => {
|
|
const { getServerFlags } = await import('./configcat')
|
|
await getServerFlags(undefined)
|
|
|
|
expect(configcat.User).toHaveBeenCalledWith(
|
|
'anonymous',
|
|
undefined,
|
|
undefined,
|
|
expect.objectContaining({ is_staff: 'false' })
|
|
)
|
|
})
|
|
})
|
|
})
|