diff --git a/.oxlintrc.json b/.oxlintrc.json index ff09567d447..cd892775dfa 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -41,6 +41,7 @@ "comfy/no-duplicate-ingest-type": "error", "comfy/no-relative-packages": "error", "comfy/no-js-private-class-members": "error", + "comfy/no-vitest-mock-method-names": "error", "comfy/no-render-in-watch-effect": "error", "comfy/no-useless-path-segments": "error", "no-array-constructor": "error", @@ -290,6 +291,12 @@ ] } }, + { + "files": ["**/vite.config.*", "**/vitest.config.*", "vitest.*.mts"], + "rules": { + "comfy/no-vitest-mock-method-names": "off" + } + }, { "files": ["src/**/*.{js,mjs,cjs,ts,mts,cts,vue}"], "excludeFiles": ["src/**/*.test.{ts,tsx}"], diff --git a/apps/billing-web/src/config/firebase.test.ts b/apps/billing-web/src/config/firebase.test.ts index fb589ddd302..dd47f92ea4f 100644 --- a/apps/billing-web/src/config/firebase.test.ts +++ b/apps/billing-web/src/config/firebase.test.ts @@ -25,10 +25,6 @@ const testIdentity = createTestIdentity({ onUserChanged: () => () => undefined }) as unknown as FirebaseIdentity -beforeEach(() => { - h.resolveFirebaseIdentity.mockReset() -}) - async function freshFirebase() { vi.resetModules() return import('@/config/firebase') diff --git a/apps/billing-web/src/session/stripeChallengePort.test.ts b/apps/billing-web/src/session/stripeChallengePort.test.ts index 976eb84a561..742aa6b5ab7 100644 --- a/apps/billing-web/src/session/stripeChallengePort.test.ts +++ b/apps/billing-web/src/session/stripeChallengePort.test.ts @@ -9,10 +9,6 @@ vi.mock(import('@stripe/stripe-js/pure'), () => ({ import { createDeferredStripeChallengePort } from '@/session/stripeChallengePort' describe('createDeferredStripeChallengePort', () => { - beforeEach(() => { - h.loadStripe.mockReset() - }) - it('reports the challenge unavailable when no key is present at call time', async () => { const port = createDeferredStripeChallengePort(() => undefined) @@ -106,10 +102,6 @@ describe('createDeferredStripeChallengePort', () => { }) describe('leavesPage', () => { - beforeEach(() => { - h.loadStripe.mockReset() - }) - it.for<{ name: string; retrieved: unknown; leaves: boolean }>([ { name: 'a challenge Stripe runs in the page', diff --git a/apps/website/src/config/workshop-firebase.test.ts b/apps/website/src/config/workshop-firebase.test.ts index 051dc6d1f7e..315b8f9d0d4 100644 --- a/apps/website/src/config/workshop-firebase.test.ts +++ b/apps/website/src/config/workshop-firebase.test.ts @@ -1,5 +1,5 @@ import type { UserCredential } from 'firebase/auth' -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { captureSignupRollbackFailure } from '@/scripts/posthog' import { @@ -163,10 +163,6 @@ describe('popup sign-in', () => { describe('social sign-in provisioning boundary', () => { const user = { uid: 'u1', email: 'a@b.co', getIdToken: async () => 'jwt' } - beforeEach(() => { - h.signInWithGoogle.mockReset() - }) - it('rethrows a popup failure untouched, so the caller sees the Firebase code', async () => { const popupFailure = { code: 'auth/popup-closed-by-user', message: 'x' } h.signInWithGoogle.mockRejectedValue(popupFailure) diff --git a/apps/website/src/scripts/posthog.test.ts b/apps/website/src/scripts/posthog.test.ts index 593909af381..29b40013883 100644 --- a/apps/website/src/scripts/posthog.test.ts +++ b/apps/website/src/scripts/posthog.test.ts @@ -17,7 +17,7 @@ const hoisted = vi.hoisted(() => ({ mockIsFeatureEnabled: vi.fn(), mockGetFeatureFlag: vi.fn(), mockIdentify: vi.fn(), - mockReset: vi.fn(), + mockPosthogReset: vi.fn(), mockGetProperty: vi.fn(), mockReloadFeatureFlags: vi.fn(), mockSetPersonPropertiesForFlags: vi.fn() @@ -62,7 +62,7 @@ const postHogMock = { isFeatureEnabled: hoisted.mockIsFeatureEnabled, getFeatureFlag: hoisted.mockGetFeatureFlag, identify: hoisted.mockIdentify, - reset: hoisted.mockReset, + reset: hoisted.mockPosthogReset, get_property: hoisted.mockGetProperty, reloadFeatureFlags: hoisted.mockReloadFeatureFlags, setPersonPropertiesForFlags: hoisted.mockSetPersonPropertiesForFlags @@ -200,14 +200,16 @@ describe('Workshop visibility', () => { hoisted.mockSetPersonPropertiesForFlags.mockClear() hoisted.mockGetProperty.mockReturnValue('signed-in-before') identifyWorkshopUser({ uid: 'someone-else' }) - expect(hoisted.mockReset).toHaveBeenCalled() + expect(hoisted.mockPosthogReset).toHaveBeenCalled() expect(hoisted.mockSetPersonPropertiesForFlags).toHaveBeenCalledWith( environment, false ) expect( hoisted.mockSetPersonPropertiesForFlags.mock.invocationCallOrder[0] - ).toBeGreaterThan(hoisted.mockReset.mock.invocationCallOrder.at(-1) ?? 0) + ).toBeGreaterThan( + hoisted.mockPosthogReset.mock.invocationCallOrder.at(-1) ?? 0 + ) }) it('requires an explicit enable and keeps the last answer through load failures', async () => { @@ -288,7 +290,7 @@ describe('Workshop visibility', () => { emitFeatureFlags() identifyWorkshopUser(null) expect(useWorkshopEnabled().value).toBe(false) - expect(hoisted.mockReset).toHaveBeenCalledTimes(2) + expect(hoisted.mockPosthogReset).toHaveBeenCalledTimes(2) expect(hoisted.mockReloadFeatureFlags).toHaveBeenCalledTimes(3) }) @@ -436,7 +438,9 @@ describe('Workshop visibility', () => { emitFeatureFlags() vi.spyOn(console, 'error').mockImplementation(() => undefined) const call = - operation === 'identify' ? hoisted.mockIdentify : hoisted.mockReset + operation === 'identify' + ? hoisted.mockIdentify + : hoisted.mockPosthogReset call.mockImplementationOnce(() => { throw new Error('Unavailable') }) @@ -455,14 +459,14 @@ describe('Workshop visibility', () => { const { initPostHog, identifyWorkshopUser } = await import('./posthog') initPostHog() identifyWorkshopUser(null) - expect(hoisted.mockReset).not.toHaveBeenCalled() + expect(hoisted.mockPosthogReset).not.toHaveBeenCalled() vi.resetModules() hoisted.mockGetProperty.mockReturnValue('previous-user') const restored = await import('./posthog') restored.initPostHog() restored.identifyWorkshopUser(null) - expect(hoisted.mockReset).toHaveBeenCalledOnce() + expect(hoisted.mockPosthogReset).toHaveBeenCalledOnce() }) }) diff --git a/apps/website/src/utils/ashby.ci.test.ts b/apps/website/src/utils/ashby.ci.test.ts index 282008a195f..ebe9a538459 100644 --- a/apps/website/src/utils/ashby.ci.test.ts +++ b/apps/website/src/utils/ashby.ci.test.ts @@ -75,7 +75,6 @@ describe('reportAshbyOutcome', () => { }) afterEach(() => { - writeSpy.mockRestore() rmSync(summaryDir, { recursive: true, force: true }) if (originalSummary === undefined) delete process.env.GITHUB_STEP_SUMMARY else process.env.GITHUB_STEP_SUMMARY = originalSummary diff --git a/apps/website/src/utils/cloudNodes.ci.test.ts b/apps/website/src/utils/cloudNodes.ci.test.ts index 9b8bfd9645a..24af104eb3e 100644 --- a/apps/website/src/utils/cloudNodes.ci.test.ts +++ b/apps/website/src/utils/cloudNodes.ci.test.ts @@ -59,7 +59,6 @@ describe('reportCloudNodesOutcome', () => { }) afterEach(() => { - writeSpy.mockRestore() rmSync(summaryDir, { recursive: true, force: true }) if (originalSummary === undefined) delete process.env.GITHUB_STEP_SUMMARY else process.env.GITHUB_STEP_SUMMARY = originalSummary diff --git a/apps/website/src/utils/featureFlags.ci.test.ts b/apps/website/src/utils/featureFlags.ci.test.ts index a5ce757290b..f402b48260a 100644 --- a/apps/website/src/utils/featureFlags.ci.test.ts +++ b/apps/website/src/utils/featureFlags.ci.test.ts @@ -39,7 +39,6 @@ describe('reportFeatureFlagsOutcome', () => { }) afterEach(() => { - writeSpy.mockRestore() rmSync(summaryDir, { recursive: true, force: true }) if (originalSummary === undefined) delete process.env.GITHUB_STEP_SUMMARY else process.env.GITHUB_STEP_SUMMARY = originalSummary diff --git a/src/components/helpcenter/HelpCenterMenuContent.test.ts b/src/components/helpcenter/HelpCenterMenuContent.test.ts index 6535a4fa03f..4fdc7395adc 100644 --- a/src/components/helpcenter/HelpCenterMenuContent.test.ts +++ b/src/components/helpcenter/HelpCenterMenuContent.test.ts @@ -1,7 +1,7 @@ import userEvent from '@testing-library/user-event' import { render, screen, waitFor } from '@testing-library/vue' import axios from 'axios' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { computed, defineComponent, h } from 'vue' import { createI18n } from 'vue-i18n' @@ -102,10 +102,6 @@ describe('HelpCenterMenuContent feedback item', () => { openSpy = vi.spyOn(window, 'open').mockReturnValue(null) }) - afterEach(() => { - openSpy.mockRestore() - }) - it('opens the Typeform survey tagged with help-center source on Cloud', async () => { distribution.isCloud = true const { user } = renderComponent() @@ -156,10 +152,6 @@ describe('HelpCenterMenuContent system status item', () => { openSpy = vi.spyOn(window, 'open').mockReturnValue(null) }) - afterEach(() => { - openSpy.mockRestore() - }) - it('opens the status page on Cloud', async () => { distribution.isCloud = true const { user } = renderComponent() diff --git a/src/components/load3d/modelThumbnail.test.ts b/src/components/load3d/modelThumbnail.test.ts index da51e12f5c6..79e19ee4c8b 100644 --- a/src/components/load3d/modelThumbnail.test.ts +++ b/src/components/load3d/modelThumbnail.test.ts @@ -25,9 +25,7 @@ function mockInstance(overrides: Record = {}) { describe('generateModelThumbnail', () => { beforeEach(() => { - createLoad3d.mockReset() - isAssetPreviewSupported.mockReset().mockReturnValue(false) - persistThumbnail.mockReset() + isAssetPreviewSupported.mockReturnValue(false) }) it('renders offscreen, returns the data url, and disposes the instance', async () => { diff --git a/src/components/queue/QueueOverlayExpanded.test.ts b/src/components/queue/QueueOverlayExpanded.test.ts index f7c6f574f5f..4c3a7ec4d49 100644 --- a/src/components/queue/QueueOverlayExpanded.test.ts +++ b/src/components/queue/QueueOverlayExpanded.test.ts @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' import { defineComponent } from 'vue' -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import type { JobListItem } from '@/composables/queue/useJobList' @@ -83,11 +83,6 @@ const stubs = { } describe('QueueOverlayExpanded', () => { - beforeEach(() => { - showMenuMock.mockClear() - toggleMenuMock.mockClear() - }) - it('renders JobAssetsList', () => { const { container } = render(QueueOverlayExpanded, { props: defaultProps, diff --git a/src/components/rightSidePanel/errors/useErrorActions.test.ts b/src/components/rightSidePanel/errors/useErrorActions.test.ts index 3bc36935413..bba584c5318 100644 --- a/src/components/rightSidePanel/errors/useErrorActions.test.ts +++ b/src/components/rightSidePanel/errors/useErrorActions.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { useCommandStore } from '@/stores/commandStore' @@ -32,10 +32,6 @@ describe('useErrorActions', () => { windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null) }) - afterEach(() => { - windowOpenSpy.mockRestore() - }) - describe('openGitHubIssues', () => { it('tracks the button click and opens the GitHub issues URL in a new tab', () => { const { openGitHubIssues } = useErrorActions() diff --git a/src/components/rightSidePanel/errors/useErrorReport.test.ts b/src/components/rightSidePanel/errors/useErrorReport.test.ts index 76d937cfb30..babeb18b4d6 100644 --- a/src/components/rightSidePanel/errors/useErrorReport.test.ts +++ b/src/components/rightSidePanel/errors/useErrorReport.test.ts @@ -1,5 +1,5 @@ import { until } from '@vueuse/core' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick, ref } from 'vue' import { useSystemStatsStore } from '@/stores/systemStatsStore' @@ -73,10 +73,6 @@ describe('useErrorReport', () => { warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) }) - afterEach(() => { - warnSpy.mockRestore() - }) - it('returns early without enrichment when the card has no runtime errors', async () => { const card = makeCard({ errors: [{ message: 'static', details: 'details' }] diff --git a/src/composables/useFeatureFlags.test.ts b/src/composables/useFeatureFlags.test.ts index 40be21c5a48..752aba0cc37 100644 --- a/src/composables/useFeatureFlags.test.ts +++ b/src/composables/useFeatureFlags.test.ts @@ -1133,7 +1133,6 @@ describe('useFeatureFlags', () => { describe('session override precedence', () => { afterEach(() => { - vi.mocked(getSessionOverride).mockReset() vi.mocked(distributionTypes).isCloud = false vi.mocked(distributionTypes).isNightly = false remoteConfigState.value = 'unloaded' diff --git a/src/composables/useLoad3dViewer.test.ts b/src/composables/useLoad3dViewer.test.ts index be6c1b24b6c..06f79bf89ca 100644 --- a/src/composables/useLoad3dViewer.test.ts +++ b/src/composables/useLoad3dViewer.test.ts @@ -772,8 +772,7 @@ describe('useLoad3dViewer', () => { describe('standalone thumbnail persistence', () => { beforeEach(() => { - isAssetPreviewSupported.mockReset().mockReturnValue(false) - persistThumbnail.mockReset() + isAssetPreviewSupported.mockReturnValue(false) vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue({ blob: () => Promise.resolve(new Blob()) }) diff --git a/src/core/graph/subgraph/preview/previewExposureChain.test.ts b/src/core/graph/subgraph/preview/previewExposureChain.test.ts index 42704bd966d..e729a272cf6 100644 --- a/src/core/graph/subgraph/preview/previewExposureChain.test.ts +++ b/src/core/graph/subgraph/preview/previewExposureChain.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import type { PreviewExposure } from '@/core/schemas/previewExposureSchema' import { toNodeId } from '@/types/nodeId' @@ -50,10 +50,6 @@ describe(resolvePreviewExposureChain, () => { warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) }) - afterEach(() => { - warnSpy.mockRestore() - }) - it('returns undefined when the named exposure is not on the starting host', () => { const ctx = makeContext(new Map(), []) expect( diff --git a/src/extensions/core/groupOptions.test.ts b/src/extensions/core/groupOptions.test.ts index 8931ee23c83..1b4f8c3cd6d 100644 --- a/src/extensions/core/groupOptions.test.ts +++ b/src/extensions/core/groupOptions.test.ts @@ -73,7 +73,6 @@ const BASE_GROUP_ITEMS: (string | null)[] = [ ] beforeEach(() => { - graphChange.mockClear() vi.mocked(useSettingStore().get).mockReturnValue(10) }) diff --git a/src/lib/litegraph/src/LGraph.serialise.test.ts b/src/lib/litegraph/src/LGraph.serialise.test.ts index bc35569428f..39b4d6d0cef 100644 --- a/src/lib/litegraph/src/LGraph.serialise.test.ts +++ b/src/lib/litegraph/src/LGraph.serialise.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe } from 'vitest' +import { describe } from 'vitest' import { LGraph, @@ -18,10 +18,6 @@ vi.mock(import('@/platform/telemetry/reportError'), () => ({ reportError: mockReportError })) -beforeEach(() => { - mockReportError.mockClear() -}) - describe('LGraph Serialisation', () => { test('can (de)serialise node / group titles', ({ expect, minimalGraph }) => { const nodeTitle = 'Test Node' diff --git a/src/lib/litegraph/src/graphIntents.test.ts b/src/lib/litegraph/src/graphIntents.test.ts index 0d6f94049d6..92faa6bc17d 100644 --- a/src/lib/litegraph/src/graphIntents.test.ts +++ b/src/lib/litegraph/src/graphIntents.test.ts @@ -32,7 +32,6 @@ function track(detach: () => void): void { afterEach(() => { for (const detach of detachers.splice(0)) detach() - vi.mocked(reportError).mockClear() }) describe('withGraphIntentSource', () => { diff --git a/src/lib/litegraph/src/node/NodeInputSlot.test.ts b/src/lib/litegraph/src/node/NodeInputSlot.test.ts index c58f8266afa..259467e3730 100644 --- a/src/lib/litegraph/src/node/NodeInputSlot.test.ts +++ b/src/lib/litegraph/src/node/NodeInputSlot.test.ts @@ -30,7 +30,6 @@ describe('NodeInputSlot', () => { const originalCallbacks = LiteGraph.onDeprecationWarning beforeEach(() => { - onWarning.mockClear() LiteGraph.onDeprecationWarning = [onWarning] LiteGraph.alwaysRepeatWarnings = true }) diff --git a/src/lib/litegraph/src/node/NodeOutputSlot.test.ts b/src/lib/litegraph/src/node/NodeOutputSlot.test.ts index ee4c94f189a..7e9989331f2 100644 --- a/src/lib/litegraph/src/node/NodeOutputSlot.test.ts +++ b/src/lib/litegraph/src/node/NodeOutputSlot.test.ts @@ -22,7 +22,6 @@ describe('NodeOutputSlot deprecated links getter', () => { const onWarning = vi.fn() beforeEach(() => { - onWarning.mockClear() LiteGraph.onDeprecationWarning = [onWarning] LiteGraph.alwaysRepeatWarnings = true }) diff --git a/src/platform/assets/composables/useUploadModelWizard.test.ts b/src/platform/assets/composables/useUploadModelWizard.test.ts index 4a0df069210..dacefa04d12 100644 --- a/src/platform/assets/composables/useUploadModelWizard.test.ts +++ b/src/platform/assets/composables/useUploadModelWizard.test.ts @@ -97,7 +97,6 @@ describe('useUploadModelWizard', () => { } afterEach(() => { - vi.mocked(api.getServerFeature).mockReset() for (const app of mountedApps.splice(0)) { app.unmount() } diff --git a/src/platform/cloud/oauth/OAuthConsentView.test.ts b/src/platform/cloud/oauth/OAuthConsentView.test.ts index 49438f9f341..ada066e334d 100644 --- a/src/platform/cloud/oauth/OAuthConsentView.test.ts +++ b/src/platform/cloud/oauth/OAuthConsentView.test.ts @@ -102,7 +102,7 @@ const renderConsent = (overrides: Partial = {}) => describe('OAuthConsentView', () => { beforeEach(() => { - mockSubmitOAuthConsentDecision.mockReset().mockResolvedValue(undefined) + mockSubmitOAuthConsentDecision.mockResolvedValue(undefined) }) it('loads the consent named in the URL on the session cookie alone, as an SSO callback lands', async () => { diff --git a/src/platform/cloud/oauth/useOAuthPostLoginRedirect.test.ts b/src/platform/cloud/oauth/useOAuthPostLoginRedirect.test.ts index b1408f2d91c..a14b73011a4 100644 --- a/src/platform/cloud/oauth/useOAuthPostLoginRedirect.test.ts +++ b/src/platform/cloud/oauth/useOAuthPostLoginRedirect.test.ts @@ -44,7 +44,7 @@ function mountRedirect() { describe('useOAuthPostLoginRedirect', () => { beforeEach(() => { - createSessionOrThrow.mockReset().mockResolvedValue(undefined) + createSessionOrThrow.mockResolvedValue(undefined) }) it('returns no-oauth when neither query nor sessionStorage holds a request id', async () => { diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts index cbae2cb6f26..b81033d7542 100644 --- a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts +++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts @@ -196,7 +196,6 @@ describe('cloudOnboardingRoutes', () => { */ describe('legacy /login through the cloud-login guard', () => { beforeEach(() => { - vi.mocked(useCurrentUser).mockClear() clearOAuthRequestId() }) diff --git a/src/platform/cloud/subscription/components/SubscribeButton.test.ts b/src/platform/cloud/subscription/components/SubscribeButton.test.ts index c22f1ac44f6..b654efbe470 100644 --- a/src/platform/cloud/subscription/components/SubscribeButton.test.ts +++ b/src/platform/cloud/subscription/components/SubscribeButton.test.ts @@ -1,6 +1,6 @@ import { useBillingContext } from '@/composables/billing/useBillingContext' import { getActivePinia } from 'pinia' -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { computed } from 'vue' import { createI18n } from 'vue-i18n' @@ -37,10 +37,6 @@ function renderComponent() { } describe('SubscribeButton', () => { - beforeEach(() => { - vi.mocked(useTelemetry())!.trackSubscription.mockClear() - }) - it('names its own surface on the subscribe event', async () => { renderComponent() diff --git a/src/platform/cloud/subscription/composables/useSubscription.test.ts b/src/platform/cloud/subscription/composables/useSubscription.test.ts index 0022e5512e0..4e50babfb51 100644 --- a/src/platform/cloud/subscription/composables/useSubscription.test.ts +++ b/src/platform/cloud/subscription/composables/useSubscription.test.ts @@ -222,7 +222,6 @@ const statusReadPaths = [ global.fetch = vi.fn() beforeEach(() => { - vi.mocked(webSessionResourceHeader).mockReset() vi.mocked(webSessionResourceHeader).mockResolvedValue(undefined) useErrorHandling().wrapWithErrorHandlingAsync = (action, errorHandler) => @@ -2778,10 +2777,6 @@ describe('useSubscription', () => { window.dispatchEvent(new Event('focus')) } - beforeEach(() => { - mockTelemetry.trackBillingEvent.mockClear() - }) - it.for<{ action: PortalAction; target: string }>([ { action: 'manageSubscription', target: 'manage_subscription' }, { action: 'handleInvoiceHistory', target: 'invoices' } diff --git a/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts index cf9b94c0632..678408c428b 100644 --- a/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts +++ b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts @@ -96,7 +96,6 @@ function createDeferred() { } beforeEach(() => { - vi.mocked(webSessionResourceHeader).mockReset() vi.mocked(webSessionResourceHeader).mockResolvedValue(undefined) Object.assign(useAuthStore(), { userId: 'user-123' }) vi.mocked(useAuthStore().getFirebaseAuthHeader).mockResolvedValue({ diff --git a/src/platform/keybindings/keybindingService.registerUserKeybindings.test.ts b/src/platform/keybindings/keybindingService.registerUserKeybindings.test.ts index fbdbc7de928..9a5ba257a4e 100644 --- a/src/platform/keybindings/keybindingService.registerUserKeybindings.test.ts +++ b/src/platform/keybindings/keybindingService.registerUserKeybindings.test.ts @@ -1,5 +1,5 @@ import { useSettingStore } from '@/platform/settings/settingStore' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { KeybindingImpl } from '@/platform/keybindings/keybinding' import { useKeybindingService } from '@/platform/keybindings/keybindingService' @@ -15,10 +15,6 @@ describe('keybindingService - registerUserKeybindings', () => { warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) }) - afterEach(() => { - warnSpy.mockRestore() - }) - it('does not warn when unset binding targets a command that no longer exists', () => { // A command removed from the app (e.g. ConvertSelectedNodesToGroupNode, // removed in #12931) can still linger in the persisted UnsetBindings. diff --git a/src/platform/onboarding/onboardingTourStore.registeredTour.test.ts b/src/platform/onboarding/onboardingTourStore.registeredTour.test.ts index 4c4cee3ed1c..9be50b8eb53 100644 --- a/src/platform/onboarding/onboardingTourStore.registeredTour.test.ts +++ b/src/platform/onboarding/onboardingTourStore.registeredTour.test.ts @@ -51,7 +51,6 @@ beforeEach(() => { describe('onboardingTourStore — runtime-resolved tours', () => { afterEach(() => { clearCoachmarks() - trackOnboardingTour.mockClear() }) it('reports no start for an entry no one registered', async () => { diff --git a/src/platform/onboarding/onboardingTourStore.test.ts b/src/platform/onboarding/onboardingTourStore.test.ts index 724ed99baa6..9a5754805ef 100644 --- a/src/platform/onboarding/onboardingTourStore.test.ts +++ b/src/platform/onboarding/onboardingTourStore.test.ts @@ -101,7 +101,6 @@ describe('onboardingTourStore', () => { appendedTargets.forEach((el) => el.remove()) appendedTargets.length = 0 setViewport({ width: 1024, height: 768 }) - trackOnboardingTour.mockClear() }) /** Register one laid-out element for a coach id, so its step resolves at once. */ diff --git a/src/platform/telemetry/assertFailureReporter.test.ts b/src/platform/telemetry/assertFailureReporter.test.ts index a7ff14f9924..057aa347916 100644 --- a/src/platform/telemetry/assertFailureReporter.test.ts +++ b/src/platform/telemetry/assertFailureReporter.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' const mockReportError = vi.hoisted(() => vi.fn()) vi.mock(import('./reportError'), () => ({ @@ -11,10 +11,6 @@ async function loadReporter() { } describe('reportAssertFailure', () => { - beforeEach(() => { - mockReportError.mockClear() - }) - it('reports an assertion failure as an invariant error', async () => { const reportAssertFailure = await loadReporter() diff --git a/src/platform/telemetry/assetLoadErrorReporting.test.ts b/src/platform/telemetry/assetLoadErrorReporting.test.ts index a3624201d84..3777f5e527b 100644 --- a/src/platform/telemetry/assetLoadErrorReporting.test.ts +++ b/src/platform/telemetry/assetLoadErrorReporting.test.ts @@ -15,7 +15,6 @@ describe('asset load error reporting', () => { let consoleError: MockInstance beforeEach(() => { - mockReportError.mockClear() consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) }) diff --git a/src/platform/telemetry/initSentry.test.ts b/src/platform/telemetry/initSentry.test.ts index bde3388e311..a72946d6522 100644 --- a/src/platform/telemetry/initSentry.test.ts +++ b/src/platform/telemetry/initSentry.test.ts @@ -38,7 +38,7 @@ function eventFrom(filename: string) { } beforeEach(() => { - vi.mocked(sentryInit).mockReset().mockReturnValue(undefined) + vi.mocked(sentryInit).mockReturnValue(undefined) }) it.for([true, false])( diff --git a/src/platform/telemetry/perf/perfMark.test.ts b/src/platform/telemetry/perf/perfMark.test.ts index 92204785c8b..d194ff5da57 100644 --- a/src/platform/telemetry/perf/perfMark.test.ts +++ b/src/platform/telemetry/perf/perfMark.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { perfMark, perfPoint } from './perfMark' @@ -7,10 +7,6 @@ const { addBreadcrumb } = vi.hoisted(() => ({ addBreadcrumb: vi.fn() })) vi.mock(import('@sentry/vue'), () => ({ addBreadcrumb })) describe('perfMark', () => { - beforeEach(() => { - addBreadcrumb.mockReset() - }) - it('degrades to no-op tracing without the Performance API', async () => { vi.stubGlobal('performance', undefined) diff --git a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts index 1bccbf9a8b1..5e85c708965 100644 --- a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts +++ b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts @@ -26,7 +26,7 @@ const hoisted = vi.hoisted(() => { const mockPeopleSet = vi.fn() const mockPeopleSetOnce = vi.fn() const mockRegister = vi.fn() - const mockReset = vi.fn() + const mockPosthogReset = vi.fn() const executionContext = { is_template: true, workflow_name: 'image_qwen_image_edit_2509', @@ -54,7 +54,7 @@ const hoisted = vi.hoisted(() => { mockPeopleSet, mockPeopleSetOnce, mockRegister, - mockReset, + mockPosthogReset, executionContext, agentPanelOpen: false, refs, @@ -65,7 +65,7 @@ const hoisted = vi.hoisted(() => { identify: mockIdentify, register: mockRegister, people: { set: mockPeopleSet, set_once: mockPeopleSetOnce }, - reset: mockReset + reset: mockPosthogReset } } } @@ -1669,14 +1669,14 @@ describe('PostHogTelemetryProvider', () => { const callback = vi.mocked(useCurrentUser().onUserLogout).mock.calls[0][0] callback() - expect(hoisted.mockReset).toHaveBeenCalledWith(true) + expect(hoisted.mockPosthogReset).toHaveBeenCalledWith(true) }) it('does not register the watcher before init resolves', () => { createProvider() expect(useCurrentUser().onUserLogout).not.toHaveBeenCalled() - expect(hoisted.mockReset).not.toHaveBeenCalled() + expect(hoisted.mockPosthogReset).not.toHaveBeenCalled() }) }) diff --git a/src/platform/telemetry/providers/cloud/storeReadinessGate.test.ts b/src/platform/telemetry/providers/cloud/storeReadinessGate.test.ts index 9f0ff780cd6..56517f855f3 100644 --- a/src/platform/telemetry/providers/cloud/storeReadinessGate.test.ts +++ b/src/platform/telemetry/providers/cloud/storeReadinessGate.test.ts @@ -119,7 +119,6 @@ describe('telemetry providers wait for Pinia before touching stores', () => { afterEach(() => { markStoresReady() hoisted.customerIoRegistration.rejection = null - hoisted.reportError.mockClear() delete (window as { __CONFIG__?: unknown }).__CONFIG__ }) diff --git a/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts b/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts index 2a14f2adedc..4fa5b76b4cd 100644 --- a/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts +++ b/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts @@ -71,7 +71,6 @@ describe('workflowDraftStoreV2', () => { }) afterEach(() => { - activeSpy?.mockRestore() activeSpy = null localStorage.clear() sessionStorage.clear() diff --git a/src/platform/workflow/templates/utils/templateModelMetadata.test.ts b/src/platform/workflow/templates/utils/templateModelMetadata.test.ts index e69ad1a235f..f03e2ee6aa2 100644 --- a/src/platform/workflow/templates/utils/templateModelMetadata.test.ts +++ b/src/platform/workflow/templates/utils/templateModelMetadata.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import type { ModelMetadataFetchOutcome } from '@/platform/missingModel/missingModelDownload' import type { ModelFile } from '@/platform/workflow/validation/schemas/workflowSchema' @@ -42,10 +42,6 @@ function deferred() { } describe('resolveTemplateModelMetadata', () => { - beforeEach(() => { - mocks.fetchModelMetadataWithStatus.mockReset() - }) - it('fetches each URL once while preserving input order and repeated identity', async () => { const shared = model('shared.safetensors') const unique = model('unique.safetensors') diff --git a/src/platform/workspace/billing/openHostedBillingTab.test.ts b/src/platform/workspace/billing/openHostedBillingTab.test.ts index 9e88f6c098e..b9afe43ad75 100644 --- a/src/platform/workspace/billing/openHostedBillingTab.test.ts +++ b/src/platform/workspace/billing/openHostedBillingTab.test.ts @@ -61,12 +61,8 @@ function fakeTab(): Window { describe('openHostedBillingTab', () => { beforeEach(() => { - mockHostedBillingRoute.mockReset().mockReturnValue(BILLING_WEB_ROUTE) - mockFetchStatus.mockClear() - mockFetchBalance.mockClear() - mockCapabilitiesRefresh.mockClear() - mockStop.mockClear() - mockRegisterRefreshOnReturn.mockClear().mockReturnValue(mockStop) + mockHostedBillingRoute.mockReturnValue(BILLING_WEB_ROUTE) + mockRegisterRefreshOnReturn.mockReturnValue(mockStop) flagState.hostedBillingDestination = 'billing_web' Object.assign(useTeamWorkspaceStore(), { activeWorkspaceId: 'ws-123' }) }) diff --git a/src/platform/workspace/composables/useDowngradeToPersonal.test.ts b/src/platform/workspace/composables/useDowngradeToPersonal.test.ts index 7eb5ef9f124..7b76d6583e7 100644 --- a/src/platform/workspace/composables/useDowngradeToPersonal.test.ts +++ b/src/platform/workspace/composables/useDowngradeToPersonal.test.ts @@ -1,7 +1,7 @@ import { useBillingCapabilities } from '@/platform/workspace/composables/useBillingCapabilities' import { getActivePinia } from 'pinia' import { useBillingOperationStore } from '@/platform/workspace/stores/billingOperationStore' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { computed, ref } from 'vue' import { useCurrentUser } from '@/composables/auth/useCurrentUser' @@ -173,10 +173,6 @@ describe('useDowngradeToPersonal', () => { windowOpen = vi.spyOn(window, 'open').mockReturnValue({} as Window) }) - afterEach(() => { - windowOpen.mockRestore() - }) - describe('removableMembers / hasOtherMembers', () => { it('protects only the original owner, removing promoted owners and members', () => { mockMembers.value = [ diff --git a/src/platform/workspace/composables/useSubscriptionCheckout.test.ts b/src/platform/workspace/composables/useSubscriptionCheckout.test.ts index 118b166a790..2076db9f969 100644 --- a/src/platform/workspace/composables/useSubscriptionCheckout.test.ts +++ b/src/platform/workspace/composables/useSubscriptionCheckout.test.ts @@ -565,13 +565,9 @@ describe('useSubscriptionCheckout', () => { } beforeEach(() => { - mockSubscribe.mockReset() - mockPreviewSubscribe.mockReset() - mockFetchPlans.mockReset() - mockFetchStatus.mockReset().mockResolvedValue(undefined) + mockFetchStatus.mockResolvedValue(undefined) vi.mocked(useBillingOperationStore().startOperation).mockReset() - mockListSavedPaymentMethods.mockReset() - mockOpenHostedBillingTab.mockReset().mockReturnValue(false) + mockOpenHostedBillingTab.mockReturnValue(false) railState.rail = null Object.assign(useBillingOperationStore(), { subscriptionActionOperation: undefined diff --git a/src/platform/workspace/utils/checkoutJourneyTelemetry.test.ts b/src/platform/workspace/utils/checkoutJourneyTelemetry.test.ts index cb5705f6590..234b2d93ffe 100644 --- a/src/platform/workspace/utils/checkoutJourneyTelemetry.test.ts +++ b/src/platform/workspace/utils/checkoutJourneyTelemetry.test.ts @@ -41,7 +41,6 @@ const PREVIEW_READY: CheckoutJourneyPhaseEvent = { phase: 'preview_ready' } const SUBMITTED: CheckoutJourneyPhaseEvent = { phase: 'submitted' } beforeEach(() => { - vi.mocked(useTelemetry()!.trackCheckoutJourneyEvent).mockClear() sessionStorage.clear() clearCheckoutJourney() }) diff --git a/src/renderer/extensions/firstRunTour/tour/cameraFraming.test.ts b/src/renderer/extensions/firstRunTour/tour/cameraFraming.test.ts index 1ed0a4723e8..ff38de3880e 100644 --- a/src/renderer/extensions/firstRunTour/tour/cameraFraming.test.ts +++ b/src/renderer/extensions/firstRunTour/tour/cameraFraming.test.ts @@ -149,8 +149,6 @@ describe('frameNode', () => { afterEach(() => { endRunningSteps() - camera.animateToBounds.mockClear() - camera.ds.fitToBounds.mockClear() camera.ds.offset = [0, 0] camera.ds.scale = 1 useCanvasStore().canvas = null diff --git a/src/renderer/extensions/firstRunTour/tour/canvasCoachTarget.test.ts b/src/renderer/extensions/firstRunTour/tour/canvasCoachTarget.test.ts index e407852baf5..50910f12688 100644 --- a/src/renderer/extensions/firstRunTour/tour/canvasCoachTarget.test.ts +++ b/src/renderer/extensions/firstRunTour/tour/canvasCoachTarget.test.ts @@ -92,8 +92,6 @@ describe('canvasNodeTarget', () => { state.canvasOffset = { left: 0, top: 0 } Object.assign(state.camera, { x: 0, y: 0, z: 1 }) if (state.layout) state.layout.value = null - state.layoutReads.mockClear() - state.releaseBounds.mockClear() }) it('releases what it watches when the tour drops it', () => { diff --git a/src/renderer/extensions/minimap/minimapDecorationRegistry.test.ts b/src/renderer/extensions/minimap/minimapDecorationRegistry.test.ts index 3b75e185673..6659a10aaaa 100644 --- a/src/renderer/extensions/minimap/minimapDecorationRegistry.test.ts +++ b/src/renderer/extensions/minimap/minimapDecorationRegistry.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { getMinimapDecorations, @@ -20,10 +20,6 @@ const scopeB = { } describe('minimapDecorationRegistry', () => { - beforeEach(() => { - vi.mocked(reportError).mockClear() - }) - it('hands a contested id to the newest registrant', () => { const outgoing = registerMinimapDecorationLayer('test.takeover') outgoing.replace([{ target: { ...scopeA, nodeId: toNodeId('1') } }]) diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.test.ts index 105169af211..29de7eef68f 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.test.ts @@ -1,7 +1,7 @@ import { getActivePinia } from 'pinia' import { render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { defineComponent, ref } from 'vue' import { createI18n } from 'vue-i18n' @@ -282,11 +282,6 @@ describe('WidgetRecordAudio', () => { vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => {}) }) - afterEach(() => { - vi.mocked(URL.createObjectURL).mockRestore() - vi.mocked(URL.revokeObjectURL).mockRestore() - }) - it('replaces the audio widget element src with a new blob URL when a recording completes', async () => { const audioWidget = createAudioWidget() primeAudioWidgetInNode([audioWidget]) diff --git a/src/services/customerEventsService.test.ts b/src/services/customerEventsService.test.ts index 92af64e8a71..828f0a1f857 100644 --- a/src/services/customerEventsService.test.ts +++ b/src/services/customerEventsService.test.ts @@ -82,7 +82,6 @@ describe('useCustomerEventsService', () => { } beforeEach(() => { - vi.mocked(webSessionResourceHeader).mockReset() vi.mocked(webSessionResourceHeader).mockResolvedValue(undefined) vi.mocked(useAuthStore().getUserAuthHeader).mockResolvedValue( mockAuthHeaders diff --git a/src/services/gateway/registrySearchGateway.test.ts b/src/services/gateway/registrySearchGateway.test.ts index 086abd1bfc8..a18a285f6f4 100644 --- a/src/services/gateway/registrySearchGateway.test.ts +++ b/src/services/gateway/registrySearchGateway.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { useRegistrySearchGateway } from '@/services/gateway/registrySearchGateway' import { useAlgoliaSearchProvider } from '@/services/providers/algoliaSearchProvider' @@ -9,17 +9,9 @@ vi.mock(import('@/services/providers/algoliaSearchProvider')) vi.mock(import('@/services/providers/registrySearchProvider')) describe('useRegistrySearchGateway', () => { - let consoleWarnSpy: ReturnType - let consoleInfoSpy: ReturnType - beforeEach(() => { - consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) - consoleInfoSpy = vi.spyOn(console, 'info').mockImplementation(() => {}) - }) - - afterEach(() => { - consoleWarnSpy.mockRestore() - consoleInfoSpy.mockRestore() + vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.spyOn(console, 'info').mockImplementation(() => {}) }) describe('Provider initialization', () => { diff --git a/src/stores/assetsStore.test.ts b/src/stores/assetsStore.test.ts index 48447925274..59b21b6fcb2 100644 --- a/src/stores/assetsStore.test.ts +++ b/src/stores/assetsStore.test.ts @@ -821,14 +821,8 @@ describe('assetsStore - Model Assets Cache (Cloud)', () => { }) describe('updateAssetTags partial-failure compensation', () => { - let consoleSpy: ReturnType - beforeEach(() => { - consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - }) - - afterEach(() => { - consoleSpy.mockRestore() + vi.spyOn(console, 'error').mockImplementation(() => {}) }) it('re-adds removed tags when add fails so cache and server converge', async () => { diff --git a/src/stores/workspace/sidebarTabStore.test.ts b/src/stores/workspace/sidebarTabStore.test.ts index e6522deef1d..51b391b3918 100644 --- a/src/stores/workspace/sidebarTabStore.test.ts +++ b/src/stores/workspace/sidebarTabStore.test.ts @@ -85,7 +85,6 @@ vi.mock( describe('useSidebarTabStore', () => { beforeEach(() => { vi.mocked(useMenuItemStore().registerCommands).mockImplementation(() => {}) - mockOpenModelLibraryBrowser.mockClear() }) const toggleModelLibrary = async () => { diff --git a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts index aba94bcb1aa..3f71adb84da 100644 --- a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts +++ b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts @@ -77,10 +77,10 @@ const toggle = () => describe('ReplyAssetGroup', () => { beforeEach(() => { - isAssetPreviewSupported.mockReset().mockReturnValue(false) - findServerPreviewUrl.mockReset().mockResolvedValue(null) - findOutputAsset.mockReset().mockResolvedValue(undefined) - generateModelThumbnail.mockReset().mockResolvedValue(null) + isAssetPreviewSupported.mockReturnValue(false) + findServerPreviewUrl.mockResolvedValue(null) + findOutputAsset.mockResolvedValue(undefined) + generateModelThumbnail.mockResolvedValue(null) }) it('T-09 / PM-652 / FE-1326 renders image and video previews inline', () => { diff --git a/src/workbench/extensions/agent/components/agent/message/ReplyAudioCard.test.ts b/src/workbench/extensions/agent/components/agent/message/ReplyAudioCard.test.ts index 4dc12f90d5c..e7ed6466d99 100644 --- a/src/workbench/extensions/agent/components/agent/message/ReplyAudioCard.test.ts +++ b/src/workbench/extensions/agent/components/agent/message/ReplyAudioCard.test.ts @@ -48,9 +48,7 @@ describe('ReplyAudioCard', () => { beforeEach(() => { vi.mocked(api.apiURL).mockImplementation((route) => `http://x/api${route}`) - vi.mocked(api.fetchApi) - .mockReset() - .mockResolvedValue(new Response(new Blob(['x']))) + vi.mocked(api.fetchApi).mockResolvedValue(new Response(new Blob(['x']))) vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:mock') vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => {}) anchorClick = vi diff --git a/src/workbench/extensions/agent/crdt/docOpMinter.test.ts b/src/workbench/extensions/agent/crdt/docOpMinter.test.ts index 772ac32ab43..9f0623d7a9d 100644 --- a/src/workbench/extensions/agent/crdt/docOpMinter.test.ts +++ b/src/workbench/extensions/agent/crdt/docOpMinter.test.ts @@ -155,7 +155,6 @@ describe('attachDocOpMinter', () => { let docInputNames: DocOpMinterDeps['docInputNames'] beforeEach(() => { - vi.mocked(reportError).mockClear() graph = new LGraph() rootGraphId = toRootGraphId(graph.id) minted = [] diff --git a/src/workbench/extensions/agent/services/agent/agentRestClient.test.ts b/src/workbench/extensions/agent/services/agent/agentRestClient.test.ts index 3480c09af2e..3dfb147868e 100644 --- a/src/workbench/extensions/agent/services/agent/agentRestClient.test.ts +++ b/src/workbench/extensions/agent/services/agent/agentRestClient.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { markErrorReported, @@ -91,11 +91,6 @@ const turnAccepted = { workflow_id: 'w1' } -beforeEach(() => { - vi.mocked(api.fetchApi).mockReset() - vi.mocked(reportError).mockReset() -}) - describe('agentRestClient route + method', () => { it('postMessage targets the literal "new" thread path to open a thread', async () => { respond(jsonResponse(202, turnAccepted)) diff --git a/tools/oxlint-plugins/comfy.ts b/tools/oxlint-plugins/comfy.ts index ced5195cef2..59a1ea7ccea 100644 --- a/tools/oxlint-plugins/comfy.ts +++ b/tools/oxlint-plugins/comfy.ts @@ -26,7 +26,8 @@ import type { noPrimeVueImports as NoPrimeVueImports, noStaticallyDisabledTest as NoStaticallyDisabledTest, noUnitTestFilesInBrowserTests as NoUnitTestFilesInBrowserTests, - noUnsafeErrorAssertion as NoUnsafeErrorAssertion + noUnsafeErrorAssertion as NoUnsafeErrorAssertion, + noVitestMockMethodNames as NoVitestMockMethodNames } from './restrictedSyntax' import type { noImportActual as NoImportActual, @@ -77,7 +78,8 @@ const { noPrimeVueImports, noStaticallyDisabledTest, noUnitTestFilesInBrowserTests, - noUnsafeErrorAssertion + noUnsafeErrorAssertion, + noVitestMockMethodNames } = requireFrom('./restrictedSyntax.ts') as { noDeprecatedApiSchema: typeof NoDeprecatedApiSchema noDirectSelectionWrite: typeof NoDirectSelectionWrite @@ -92,6 +94,7 @@ const { noStaticallyDisabledTest: typeof NoStaticallyDisabledTest noUnitTestFilesInBrowserTests: typeof NoUnitTestFilesInBrowserTests noUnsafeErrorAssertion: typeof NoUnsafeErrorAssertion + noVitestMockMethodNames: typeof NoVitestMockMethodNames } const { noImportActual, @@ -139,6 +142,7 @@ export default { 'no-unit-test-files-in-browser-tests': noUnitTestFilesInBrowserTests, 'no-unsafe-error-assertion': noUnsafeErrorAssertion, 'no-useless-path-segments': noUselessPathSegments, + 'no-vitest-mock-method-names': noVitestMockMethodNames, 'prefer-initial-settings': preferInitialSettings, 'use-global-pinia': useGlobalPinia } diff --git a/tools/oxlint-plugins/restrictedSyntax.test.ts b/tools/oxlint-plugins/restrictedSyntax.test.ts index 685c27ac818..24c829b4d5d 100644 --- a/tools/oxlint-plugins/restrictedSyntax.test.ts +++ b/tools/oxlint-plugins/restrictedSyntax.test.ts @@ -96,6 +96,30 @@ void unrelated void Example ` }, + { + file: path.join(probeDirs.source, 'mockMethodNames.ts'), + source: `interface Cache { + mockClear(): void + mockReset: () => void +} +type Store = { mockRestore(): void } +class Fake { + mockClear() {} + mockReset = () => {} +} +const fake = { mockRestore() {}, 'mockClear': () => {}, mockReset } +const { mockReset: renamed } = source +const allowed = { reset() {}, mockFn: vi.fn() } +void (fake as Cache & Store) +void Fake +void renamed +void allowed +` + }, + { + file: path.join(probeDirs.source, 'vitest.config.ts'), + source: 'export default { test: { mockReset: true, restoreMocks: true } }\n' + }, { file: path.join(probeDirs.source, 'computed.vue'), source: `