From fa24ef0b7d196b87feebeacdcff63e9ee07b9ccb Mon Sep 17 00:00:00 2001 From: Amp Date: Mon, 14 Sep 2026 22:45:51 +0000 Subject: [PATCH 1/3] test: audit and remove trivial untyped mock factories --- docs/guidance/vitest.md | 14 +++++ scripts/auditMockFactories.test.ts | 38 ++++++++++++ scripts/auditMockFactories.ts | 60 +++++++++++++++++++ src/components/graph/GraphCanvas.test.ts | 4 +- .../sidebar/tabs/AssetsSidebarTab.test.ts | 2 +- src/components/topbar/WorkflowTabs.test.ts | 2 +- .../node/useNodeAnimatedImage.test.ts | 10 +++- src/composables/useCoreCommands.test.ts | 2 +- src/extensions/core/agentPanel.test.ts | 2 +- .../agentPanelGateDependencyFailure.test.ts | 2 +- .../modelInfo/ModelInfoPanel.test.ts | 5 +- .../composables/useMediaAssetActions.test.ts | 2 +- .../assets/services/assetService.test.ts | 4 +- .../assets/utils/assetMetadataUtils.test.ts | 5 +- .../markDeletedAssetsAsMissingMedia.test.ts | 2 +- .../auth/session/useSessionCookie.test.ts | 2 +- src/platform/auth/unified/remintRetry.test.ts | 2 +- ...DesktopCloudNotificationController.test.ts | 16 +++-- .../onboarding/desktopLoginRedemption.test.ts | 2 +- .../components/PricingTable.test.ts | 2 +- .../composables/useSubscription.test.ts | 2 +- .../composables/useSubscriptionDialog.test.ts | 2 +- .../launchCancellationFlow.test.ts | 2 +- .../utils/subscriptionCheckoutUtil.test.ts | 2 +- .../teamSubscriptionCheckoutUtil.test.ts | 2 +- .../keybindings/presetService.test.ts | 2 +- .../missingMediaAssetResolver.test.ts | 2 +- .../missingMedia/missingMediaScan.test.ts | 2 +- .../components/MissingModelCard.test.ts | 20 ++++--- .../useMissingModelInteractions.test.ts | 2 +- .../missingModel/missingModelDownload.test.ts | 21 ++++--- .../missingModel/missingModelPipeline.test.ts | 2 +- .../missingModel/missingModelScan.test.ts | 2 +- .../missingModel/missingModelStore.test.ts | 4 +- .../settings/globalSettingsApi.test.ts | 6 +- .../cloud/PostHogTelemetryProvider.test.ts | 2 +- .../stores/billingOperationStore.test.ts | 2 +- .../vueNodes/layout/useNodeDrag.test.ts | 2 +- .../components/WidgetSelectDropdown.test.ts | 2 +- .../useWidgetSelectActions.test.ts | 2 +- .../apiKeyAuthStore.integration.test.ts | 14 +++-- src/stores/authStore.test.ts | 2 +- src/stores/modelStore.test.ts | 7 +-- src/stores/workspace/sidebarTabStore.test.ts | 2 +- .../extensions/agent/AgentPanelRoot.test.ts | 4 +- .../composables/agent/useAgentConsent.test.ts | 8 +-- .../stores/agent/agentConsentStore.test.ts | 4 +- .../stores/agent/agentPanelTarget.test.ts | 2 +- 48 files changed, 214 insertions(+), 90 deletions(-) create mode 100644 scripts/auditMockFactories.test.ts create mode 100644 scripts/auditMockFactories.ts diff --git a/docs/guidance/vitest.md b/docs/guidance/vitest.md index 797608fc650..b01d9264bfe 100644 --- a/docs/guidance/vitest.md +++ b/docs/guidance/vitest.md @@ -30,6 +30,20 @@ ESLint rule enforces the Testing Library query rule. Do not disable it. - Module-scope `vi.fn()` declarations may provide reset-persistent defaults by passing the implementation directly to `vi.fn(implementation)`. +### Audit legacy mock factories + +Run `pnpm exec tsx scripts/auditMockFactories.ts` from the repository root to +list `vi.mock` and `vi.doMock` calls in tracked TypeScript +files under `src`. The JSON output includes the module and source lines, +including multiline calls, and excludes comments and string contents. + +First remove `` and run `pnpm typecheck`. If a literal export widens +to `string`, annotate the factory's return type as `Partial` +using `import type * as Module from '…'`. This context checks literal exports +without an inline `import()` type or a cast. Leave missing instance members +and incompatible signatures for a typed fixture repair rather than replacing +the escape with a cast or an untyped module path. + ## No Real Network `vitest.setup.ts` blocks every `http(s)` `fetch`, and happy-dom is configured not diff --git a/scripts/auditMockFactories.test.ts b/scripts/auditMockFactories.test.ts new file mode 100644 index 00000000000..9f49d9a000e --- /dev/null +++ b/scripts/auditMockFactories.test.ts @@ -0,0 +1,38 @@ +import { describe, expect, it } from 'vitest' + +import { findUntypedMockFactories } from './auditMockFactories' + +describe('findUntypedMockFactories', () => { + it.for([ + ["vi.mock(import('./app'), () => ({}))", './app'], + ["vi.doMock('./api', () => ({}))", './api'], + ['vi.mock(modulePath, () => ({}))', ''] + ])('reports %s', ([source, module]) => { + expect(findUntypedMockFactories('example.test.ts', source)).toEqual([ + { file: 'example.test.ts', line: 1, endLine: 1, module } + ]) + }) + + it('finds nested multiline calls and ignores lookalikes', () => { + const source = [ + '// vi.mock(import("./comment"), () => ({}))', + 'const text = "vi.mock(import(\'./string\'), () => ({}))"', + 'vi.mock(import("./typed"), () => ({}))', + 'vi.mock(import("./other-type"), () => ({}))', + 'other.mock(import("./other-object"), () => ({}))', + 'vi.fn()', + 'function setup() {', + ' vi.doMock<', + ' unknown', + ' >(', + ' import("./nested"),', + ' () => ({})', + ' )', + '}' + ].join('\r\n') + + expect(findUntypedMockFactories('nested.test.ts', source)).toEqual([ + { file: 'nested.test.ts', line: 8, endLine: 13, module: './nested' } + ]) + }) +}) diff --git a/scripts/auditMockFactories.ts b/scripts/auditMockFactories.ts new file mode 100644 index 00000000000..6fa5170f7bc --- /dev/null +++ b/scripts/auditMockFactories.ts @@ -0,0 +1,60 @@ +import { execFileSync } from 'node:child_process' +import { readFileSync } from 'node:fs' +import { pathToFileURL } from 'node:url' + +import * as ts from 'typescript' + +export function findUntypedMockFactories(file: string, text: string) { + const source = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true) + const sites: { + file: string + line: number + endLine: number + module: string + }[] = [] + + function visit(node: ts.Node) { + if ( + ts.isCallExpression(node) && + ts.isPropertyAccessExpression(node.expression) && + ts.isIdentifier(node.expression.expression) && + node.expression.expression.text === 'vi' && + ['mock', 'doMock'].includes(node.expression.name.text) && + node.typeArguments?.length === 1 && + node.typeArguments[0].kind === ts.SyntaxKind.UnknownKeyword + ) { + const argument = node.arguments[0] + const module = + argument && + ts.isCallExpression(argument) && + argument.expression.kind === ts.SyntaxKind.ImportKeyword + ? argument.arguments[0] + : argument + sites.push({ + file, + line: source.getLineAndCharacterOfPosition(node.getStart()).line + 1, + endLine: source.getLineAndCharacterOfPosition(node.end).line + 1, + module: module && ts.isStringLiteral(module) ? module.text : '' + }) + } + ts.forEachChild(node, visit) + } + + visit(source) + return sites +} + +if ( + process.argv[1] && + import.meta.url === pathToFileURL(process.argv[1]).href +) { + const files = execFileSync('git', ['ls-files', '-z', 'src'], { + encoding: 'utf8' + }) + .split('\0') + .filter((file) => /\.tsx?$/.test(file)) + const sites = files.flatMap((file) => + findUntypedMockFactories(file, readFileSync(file, 'utf8')) + ) + console.log(JSON.stringify(sites, null, 2)) +} diff --git a/src/components/graph/GraphCanvas.test.ts b/src/components/graph/GraphCanvas.test.ts index 1a72e3c920a..5be7511ce4a 100644 --- a/src/components/graph/GraphCanvas.test.ts +++ b/src/components/graph/GraphCanvas.test.ts @@ -116,13 +116,13 @@ vi.mock( }) ) -vi.mock(import('@/composables/useCanvasDrop'), () => ({ +vi.mock(import('@/composables/useCanvasDrop'), () => ({ useCanvasDrop: vi.fn() })) vi.mock(import('@/platform/settings/composables/useLitegraphSettings'), () => ({ useLitegraphSettings: vi.fn() })) -vi.mock(import('@/composables/node/useNodeBadge'), () => ({ +vi.mock(import('@/composables/node/useNodeBadge'), () => ({ useNodeBadge: vi.fn() })) vi.mock(import('@/composables/useGlobalLitegraph'), () => ({ diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts index ae270bb6953..e440b42a884 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts +++ b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts @@ -84,7 +84,7 @@ vi.mock( }) ) -vi.mock(import('@/platform/assets/utils/outputAssetUtil')) +vi.mock(import('@/platform/assets/utils/outputAssetUtil')) vi.mock( import('primevue/usetoast'), // eslint-disable-line primevue-removal/no-imports diff --git a/src/components/topbar/WorkflowTabs.test.ts b/src/components/topbar/WorkflowTabs.test.ts index acbfd1e1201..80815231387 100644 --- a/src/components/topbar/WorkflowTabs.test.ts +++ b/src/components/topbar/WorkflowTabs.test.ts @@ -17,7 +17,7 @@ import WorkflowTabs from './WorkflowTabs.vue' vi.mock(import('firebase/auth')) vi.mock(import('@/platform/telemetry')) -vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) +vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) const distribution = vi.hoisted(() => ({ isCloud: false, diff --git a/src/composables/node/useNodeAnimatedImage.test.ts b/src/composables/node/useNodeAnimatedImage.test.ts index 1d8f351c1aa..82fded940eb 100644 --- a/src/composables/node/useNodeAnimatedImage.test.ts +++ b/src/composables/node/useNodeAnimatedImage.test.ts @@ -2,6 +2,7 @@ import { describe, expect, it, onTestFinished, vi } from 'vitest' import { useNodeAnimatedImage } from '@/composables/node/useNodeAnimatedImage' import { createMockMediaNode } from '@/renderer/extensions/vueNodes/widgets/composables/domWidgetTestUtils' +import type * as AppModule from '@/scripts/app' const { canvasInteractionsMock } = vi.hoisted(() => ({ canvasInteractionsMock: { @@ -22,9 +23,12 @@ vi.mock( ) // `@/scripts/app` has a heavy import graph (pinia stores, LGraphCanvas, etc.) // that we cannot pull in here, so we stub only the constant we need. -vi.mock(import('@/scripts/app'), () => ({ - ANIM_PREVIEW_WIDGET: '$$comfy_animation_preview' -})) +vi.mock( + import('@/scripts/app'), + (): Partial => ({ + ANIM_PREVIEW_WIDGET: '$$comfy_animation_preview' + }) +) describe('useNodeAnimatedImage', () => { function setup() { diff --git a/src/composables/useCoreCommands.test.ts b/src/composables/useCoreCommands.test.ts index bb65196ac16..c46da96a7ae 100644 --- a/src/composables/useCoreCommands.test.ts +++ b/src/composables/useCoreCommands.test.ts @@ -87,7 +87,7 @@ vi.mock(import('@/scripts/api'), () => ({ })) const mockDistributionState = vi.hoisted(() => ({ isCloud: false })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockDistributionState.isCloud } diff --git a/src/extensions/core/agentPanel.test.ts b/src/extensions/core/agentPanel.test.ts index ff87eb27e00..2eea2174bf3 100644 --- a/src/extensions/core/agentPanel.test.ts +++ b/src/extensions/core/agentPanel.test.ts @@ -1,5 +1,5 @@ vi.mock(import('firebase/auth')) -vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) +vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { Mocked } from 'vitest' import { computed, effectScope, ref } from 'vue' diff --git a/src/extensions/core/agentPanelGateDependencyFailure.test.ts b/src/extensions/core/agentPanelGateDependencyFailure.test.ts index 12989792447..327729c6dfc 100644 --- a/src/extensions/core/agentPanelGateDependencyFailure.test.ts +++ b/src/extensions/core/agentPanelGateDependencyFailure.test.ts @@ -1,5 +1,5 @@ vi.mock(import('firebase/auth')) -vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) +vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) import { beforeEach, describe, expect, it, vi } from 'vitest' import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore' diff --git a/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts b/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts index debe0ea91ca..bba5b7aa9b4 100644 --- a/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts +++ b/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts @@ -18,10 +18,7 @@ vi.mock(import('@/composables/useCopyToClipboard'), () => ({ const mockDistribution = vi.hoisted( (): { isCloud: typeof DistributionTypes.isCloud } => ({ isCloud: false }) ) -vi.mock( - import('@/platform/distribution/types'), - () => mockDistribution -) +vi.mock(import('@/platform/distribution/types'), () => mockDistribution) vi.mock(import('@/platform/assets/composables/useModelTypes'), async () => { const { ref } = await import('vue') diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index 48ac84e0490..182e53cfeee 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -29,7 +29,7 @@ vi.mock(import('@/base/common/downloadUtil'), () => ({ downloadFile: mockDownloadFile })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockIsCloud.value } diff --git a/src/platform/assets/services/assetService.test.ts b/src/platform/assets/services/assetService.test.ts index 34413011f07..1419e0cead0 100644 --- a/src/platform/assets/services/assetService.test.ts +++ b/src/platform/assets/services/assetService.test.ts @@ -16,7 +16,7 @@ import { api } from '@/scripts/api' const mockDistributionState = vi.hoisted(() => ({ isCloud: false })) const mockSupportsModelTypeTags = vi.hoisted(() => ({ value: true })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockDistributionState.isCloud } @@ -43,7 +43,7 @@ vi.mock(import('@/scripts/api'), () => ({ } })) -vi.mock(import('@/i18n'), () => ({ +vi.mock(import('@/i18n'), () => ({ t: (key: string) => key, st: vi.fn((_key: string, fallback: string) => fallback) })) diff --git a/src/platform/assets/utils/assetMetadataUtils.test.ts b/src/platform/assets/utils/assetMetadataUtils.test.ts index d05b20323c7..b20bcf842c2 100644 --- a/src/platform/assets/utils/assetMetadataUtils.test.ts +++ b/src/platform/assets/utils/assetMetadataUtils.test.ts @@ -40,10 +40,7 @@ const mockDistribution = vi.hoisted( (): { isCloud: typeof DistributionTypes.isCloud } => ({ isCloud: true }) ) -vi.mock( - import('@/platform/distribution/types'), - () => mockDistribution -) +vi.mock(import('@/platform/distribution/types'), () => mockDistribution) describe('assetMetadataUtils', () => { const mockAsset: AssetItem = { diff --git a/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts b/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts index 00bfa1834b5..8b535488fe5 100644 --- a/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts +++ b/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts @@ -10,7 +10,7 @@ import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore' import { markDeletedAssetsAsMissingMedia } from './markDeletedAssetsAsMissingMedia' -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) diff --git a/src/platform/auth/session/useSessionCookie.test.ts b/src/platform/auth/session/useSessionCookie.test.ts index 1cf26e52a2e..e91dabdc756 100644 --- a/src/platform/auth/session/useSessionCookie.test.ts +++ b/src/platform/auth/session/useSessionCookie.test.ts @@ -11,7 +11,7 @@ const mockGetAuthHeader = vi.fn< >(async () => null) const originalFetch = globalThis.fetch -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) diff --git a/src/platform/auth/unified/remintRetry.test.ts b/src/platform/auth/unified/remintRetry.test.ts index da565e30ea0..33c76045aa1 100644 --- a/src/platform/auth/unified/remintRetry.test.ts +++ b/src/platform/auth/unified/remintRetry.test.ts @@ -32,7 +32,7 @@ vi.mock(import('@/composables/useFeatureFlags'), () => ({ // The axios interceptor gates on shouldRemintCloudRequest(), which is a no-op // off-cloud; the unit env is not a cloud build, so force it on. -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) diff --git a/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts b/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts index e37a086b8a0..377c6b62ead 100644 --- a/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts +++ b/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts @@ -2,6 +2,7 @@ import { render } from '@testing-library/vue' import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' import { useSettingStore } from '@/platform/settings/settingStore' +import type * as DistributionTypes from '@/platform/distribution/types' import DesktopCloudNotificationController from './DesktopCloudNotificationController.vue' @@ -17,12 +18,15 @@ const electron = { const errorReporter = vi.hoisted(() => vi.fn()) -vi.mock(import('@/platform/distribution/types'), () => ({ - DISTRIBUTION: 'desktop', - isCloud: false, - isDesktop: true, - isNightly: false -})) +vi.mock( + import('@/platform/distribution/types'), + (): Partial => ({ + DISTRIBUTION: 'desktop', + isCloud: false, + isDesktop: true, + isNightly: false + }) +) vi.mock(import('@/platform/telemetry/reportError'), () => ({ reportError: errorReporter diff --git a/src/platform/cloud/onboarding/desktopLoginRedemption.test.ts b/src/platform/cloud/onboarding/desktopLoginRedemption.test.ts index 51c8a2c31af..fbdcf5e7312 100644 --- a/src/platform/cloud/onboarding/desktopLoginRedemption.test.ts +++ b/src/platform/cloud/onboarding/desktopLoginRedemption.test.ts @@ -25,7 +25,7 @@ const mockToastAdd = vi.hoisted(() => vi.fn()) const mockUserGetIdToken = vi.hoisted(() => vi.fn()) const mockStoreGetIdToken = vi.hoisted(() => vi.fn()) -vi.mock(import('@/i18n'), () => ({ +vi.mock(import('@/i18n'), () => ({ t: (key: string) => key })) diff --git a/src/platform/cloud/subscription/components/PricingTable.test.ts b/src/platform/cloud/subscription/components/PricingTable.test.ts index 99516cd8eb1..1ab8e8052b6 100644 --- a/src/platform/cloud/subscription/components/PricingTable.test.ts +++ b/src/platform/cloud/subscription/components/PricingTable.test.ts @@ -128,7 +128,7 @@ vi.mock( }) ) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) diff --git a/src/platform/cloud/subscription/composables/useSubscription.test.ts b/src/platform/cloud/subscription/composables/useSubscription.test.ts index 17fe6ad5a7e..067aaf96354 100644 --- a/src/platform/cloud/subscription/composables/useSubscription.test.ts +++ b/src/platform/cloud/subscription/composables/useSubscription.test.ts @@ -133,7 +133,7 @@ vi.mock(import('@/composables/useErrorHandling'), () => ({ })) })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockIsCloud.value } diff --git a/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts b/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts index d355c1073b5..dca4859dfe9 100644 --- a/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts +++ b/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts @@ -83,7 +83,7 @@ vi.mock(import('@/composables/useFeatureFlags'), () => ({ }) })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockIsCloud.value } diff --git a/src/platform/cloud/subscription/launchCancellationFlow.test.ts b/src/platform/cloud/subscription/launchCancellationFlow.test.ts index 0417762fba9..ea3446b9374 100644 --- a/src/platform/cloud/subscription/launchCancellationFlow.test.ts +++ b/src/platform/cloud/subscription/launchCancellationFlow.test.ts @@ -31,7 +31,7 @@ vi.mock(import('@/composables/billing/useBillingContext'), () => ({ }) })) -vi.mock(import('@/i18n'), () => ({ +vi.mock(import('@/i18n'), () => ({ t: (key: string) => key })) diff --git a/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts index 2cc332a4ab2..5bf24a89f1c 100644 --- a/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts +++ b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts @@ -68,7 +68,7 @@ vi.mock(import('@/platform/telemetry'), () => ({ useTelemetry: vi.fn(() => mockTelemetry) })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockIsCloud.value } diff --git a/src/platform/cloud/subscription/utils/teamSubscriptionCheckoutUtil.test.ts b/src/platform/cloud/subscription/utils/teamSubscriptionCheckoutUtil.test.ts index 0aca991e6c7..572d2b1f0cf 100644 --- a/src/platform/cloud/subscription/utils/teamSubscriptionCheckoutUtil.test.ts +++ b/src/platform/cloud/subscription/utils/teamSubscriptionCheckoutUtil.test.ts @@ -13,7 +13,7 @@ const { mockTrackBillingEvent: vi.fn() })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return mockIsCloud.value } diff --git a/src/platform/keybindings/presetService.test.ts b/src/platform/keybindings/presetService.test.ts index 96519c6d956..6c49ad7f522 100644 --- a/src/platform/keybindings/presetService.test.ts +++ b/src/platform/keybindings/presetService.test.ts @@ -73,7 +73,7 @@ vi.mock(import('@/platform/keybindings/keybindingService'), () => ({ }) })) -vi.mock(import('@/i18n'), () => ({ +vi.mock(import('@/i18n'), () => ({ t: (key: string) => key })) diff --git a/src/platform/missingMedia/missingMediaAssetResolver.test.ts b/src/platform/missingMedia/missingMediaAssetResolver.test.ts index f9c265b4f24..612d7d5365d 100644 --- a/src/platform/missingMedia/missingMediaAssetResolver.test.ts +++ b/src/platform/missingMedia/missingMediaAssetResolver.test.ts @@ -28,7 +28,7 @@ vi.mock(import('@/platform/assets/services/assetService'), () => ({ } })) -vi.mock(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({ +vi.mock(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({ fetchHistoryPage: mockFetchHistoryPage })) diff --git a/src/platform/missingMedia/missingMediaScan.test.ts b/src/platform/missingMedia/missingMediaScan.test.ts index 9b1c16089a3..91114305c50 100644 --- a/src/platform/missingMedia/missingMediaScan.test.ts +++ b/src/platform/missingMedia/missingMediaScan.test.ts @@ -83,7 +83,7 @@ vi.mock(import('@/platform/assets/services/assetService'), () => ({ } })) -vi.mock(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({ +vi.mock(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({ fetchHistoryPage: mockFetchHistoryPage })) diff --git a/src/platform/missingModel/components/MissingModelCard.test.ts b/src/platform/missingModel/components/MissingModelCard.test.ts index 1ac3cb2c96e..cc988b8a2f3 100644 --- a/src/platform/missingModel/components/MissingModelCard.test.ts +++ b/src/platform/missingModel/components/MissingModelCard.test.ts @@ -7,6 +7,7 @@ import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' with { type: 'json' } +import type * as DistributionTypes from '@/platform/distribution/types' import type { MissingModelGroup, MissingModelViewModel @@ -44,14 +45,17 @@ vi.mock(import('./MissingModelRow.vue'), () => ({ })) const mockIsCloud = vi.hoisted(() => ({ value: true })) -vi.mock(import('@/platform/distribution/types'), () => ({ - DISTRIBUTION: 'cloud', - get isCloud() { - return mockIsCloud.value - }, - isDesktop: false, - isNightly: false -})) +vi.mock( + import('@/platform/distribution/types'), + (): Partial => ({ + DISTRIBUTION: 'cloud', + get isCloud() { + return mockIsCloud.value + }, + isDesktop: false, + isNightly: false + }) +) import MissingModelCard from './MissingModelCard.vue' diff --git a/src/platform/missingModel/composables/useMissingModelInteractions.test.ts b/src/platform/missingModel/composables/useMissingModelInteractions.test.ts index 742f632c30c..2ce8fc71755 100644 --- a/src/platform/missingModel/composables/useMissingModelInteractions.test.ts +++ b/src/platform/missingModel/composables/useMissingModelInteractions.test.ts @@ -27,7 +27,7 @@ const mockDownloadList = vi.fn( >[] => [] ) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: false })) diff --git a/src/platform/missingModel/missingModelDownload.test.ts b/src/platform/missingModel/missingModelDownload.test.ts index 82019e0e4af..18ec961569e 100644 --- a/src/platform/missingModel/missingModelDownload.test.ts +++ b/src/platform/missingModel/missingModelDownload.test.ts @@ -2,6 +2,8 @@ import { useElectronDownloadStore } from '@/stores/electronDownloadStore' import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore' import { beforeEach, describe, expect, it, vi } from 'vitest' +import type * as DistributionTypes from '@/platform/distribution/types' + import { clearMetadataCache, downloadModel, @@ -18,14 +20,17 @@ const { fetchMock, mockIsDesktop, mockStartDownload } = vi.hoisted(() => ({ mockStartDownload: vi.fn() })) -vi.mock(import('@/platform/distribution/types'), () => ({ - DISTRIBUTION: 'localhost', - isCloud: false, - get isDesktop() { - return mockIsDesktop.value - }, - isNightly: false -})) +vi.mock( + import('@/platform/distribution/types'), + (): Partial => ({ + DISTRIBUTION: 'localhost', + isCloud: false, + get isDesktop() { + return mockIsDesktop.value + }, + isNightly: false + }) +) beforeEach(() => { mockIsDesktop.value = false diff --git a/src/platform/missingModel/missingModelPipeline.test.ts b/src/platform/missingModel/missingModelPipeline.test.ts index 5f6c53dda53..f7974e6ac47 100644 --- a/src/platform/missingModel/missingModelPipeline.test.ts +++ b/src/platform/missingModel/missingModelPipeline.test.ts @@ -71,7 +71,7 @@ const { mockHandles } = vi.hoisted(() => { } }) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: false })) diff --git a/src/platform/missingModel/missingModelScan.test.ts b/src/platform/missingModel/missingModelScan.test.ts index bc93c500278..2e67b1a6df1 100644 --- a/src/platform/missingModel/missingModelScan.test.ts +++ b/src/platform/missingModel/missingModelScan.test.ts @@ -1740,7 +1740,7 @@ const { mockUpdateModelsForNodeType, mockGetAssets } = vi.hoisted(() => ({ mockGetAssets: vi.fn().mockReturnValue([]) })) -vi.mock(import('@/i18n'), () => ({ +vi.mock(import('@/i18n'), () => ({ t: (key: string) => key, st: (_key: string, fallback: string) => fallback })) diff --git a/src/platform/missingModel/missingModelStore.test.ts b/src/platform/missingModel/missingModelStore.test.ts index 9a00a094bb2..231555d7250 100644 --- a/src/platform/missingModel/missingModelStore.test.ts +++ b/src/platform/missingModel/missingModelStore.test.ts @@ -13,12 +13,12 @@ const mockNodeLocatorIdToNodeExecutionId = vi.hoisted(() => vi.fn((nodeLocatorId: string) => nodeLocatorId) ) -vi.mock(import('@/i18n'), () => ({ +vi.mock(import('@/i18n'), () => ({ t: vi.fn((key: string) => `translated:${key}`), st: vi.fn((_key: string, fallback: string) => fallback) })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: false })) diff --git a/src/platform/settings/globalSettingsApi.test.ts b/src/platform/settings/globalSettingsApi.test.ts index 3a072b64559..4449b3e100f 100644 --- a/src/platform/settings/globalSettingsApi.test.ts +++ b/src/platform/settings/globalSettingsApi.test.ts @@ -7,17 +7,17 @@ import { setGlobalSetting } from './globalSettingsApi' -vi.mock(import('@/config/comfyApi'), () => ({ +vi.mock(import('@/config/comfyApi'), () => ({ getComfyApiBaseUrl: () => 'https://api.comfy.test' })) const distribution = vi.hoisted(() => ({ isCloud: true })) -vi.mock(import('@/platform/distribution/types'), () => distribution) +vi.mock(import('@/platform/distribution/types'), () => distribution) const fetchApi = vi.hoisted(() => vi.fn()) vi.mock(import('@/scripts/api'), () => ({ api: { fetchApi, apiURL: (path: string) => `/api${path}` } })) const fetchWithUnifiedRemint = vi.hoisted(() => vi.fn()) -vi.mock(import('@/platform/auth/unified/remintRetry'), () => ({ +vi.mock(import('@/platform/auth/unified/remintRetry'), () => ({ fetchWithUnifiedRemint, shouldRemintCloudRequest: () => Promise.resolve(false) })) diff --git a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts index b788ed55843..5dee80741ba 100644 --- a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts +++ b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts @@ -73,7 +73,7 @@ vi.mock(import('@/composables/auth/useCurrentUser'), () => ({ }) })) -vi.mock(import('@/platform/remoteConfig/remoteConfig'), async () => { +vi.mock(import('@/platform/remoteConfig/remoteConfig'), async () => { hoisted.refs.remoteConfig = ref({}) return { remoteConfig: hoisted.refs.remoteConfig } }) diff --git a/src/platform/workspace/stores/billingOperationStore.test.ts b/src/platform/workspace/stores/billingOperationStore.test.ts index cb8c5db563b..4fa3afe4f0f 100644 --- a/src/platform/workspace/stores/billingOperationStore.test.ts +++ b/src/platform/workspace/stores/billingOperationStore.test.ts @@ -50,7 +50,7 @@ vi.mock(import('@/composables/useFeatureFlags'), () => ({ const mockReportError = vi.hoisted(() => vi.fn()) -vi.mock(import('@/platform/telemetry/reportError'), () => ({ +vi.mock(import('@/platform/telemetry/reportError'), () => ({ reportError: mockReportError })) diff --git a/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts b/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts index b48a7ab124d..100f0b88ed5 100644 --- a/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts +++ b/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts @@ -42,7 +42,7 @@ const testState = vi.hoisted(() => { } }) -vi.mock(import('@/renderer/core/canvas/useAutoPan'), () => ({ +vi.mock(import('@/renderer/core/canvas/useAutoPan'), () => ({ AutoPanController: vi.fn() })) diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts index a26916a95a2..fc4044106f9 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts @@ -18,7 +18,7 @@ import { createMockWidget } from './widgetTestUtils' const mockCheckState = vi.hoisted(() => vi.fn()) const mockAssetsData = vi.hoisted(() => ({ items: [] as AssetItem[] })) -vi.mock(import('@/scripts/api')) +vi.mock(import('@/scripts/api')) vi.mock( import('@/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData'), diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts index ece8414042e..b51740cfc99 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts @@ -10,7 +10,7 @@ import type { SimplifiedWidget } from '@/types/simplifiedWidget' const mockCaptureCanvasState = vi.hoisted(() => vi.fn()) -vi.mock(import('@/scripts/api')) +vi.mock(import('@/scripts/api')) function createItems(...names: string[]): FormDropdownItem[] { return names.map((name, i) => ({ diff --git a/src/stores/apiKeyAuthStore.integration.test.ts b/src/stores/apiKeyAuthStore.integration.test.ts index 1882393c740..78e3df0720e 100644 --- a/src/stores/apiKeyAuthStore.integration.test.ts +++ b/src/stores/apiKeyAuthStore.integration.test.ts @@ -3,6 +3,7 @@ import * as firebaseAuth from 'firebase/auth' import { beforeEach, describe, expect, it, vi } from 'vitest' import * as vuefire from 'vuefire' +import type * as DistributionTypes from '@/platform/distribution/types' import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore' import { useAuthStore } from '@/stores/authStore' @@ -14,11 +15,14 @@ vi.mock(import('vuefire'), () => ({ vi.mock(import('firebase/auth')) -vi.mock(import('@/platform/distribution/types'), () => ({ - DISTRIBUTION: 'cloud', - isCloud: true, - isDesktop: false -})) +vi.mock( + import('@/platform/distribution/types'), + (): Partial => ({ + DISTRIBUTION: 'cloud', + isCloud: true, + isDesktop: false + }) +) vi.mock(import('@/composables/useFeatureFlags'), () => ({ useFeatureFlags: () => ({ diff --git a/src/stores/authStore.test.ts b/src/stores/authStore.test.ts index 462b567f95b..1429154b17c 100644 --- a/src/stores/authStore.test.ts +++ b/src/stores/authStore.test.ts @@ -40,7 +40,7 @@ const { mockFeatureFlags } = vi.hoisted(() => ({ const mockReportError = vi.hoisted(() => vi.fn()) -vi.mock(import('@/platform/telemetry/reportError'), () => ({ +vi.mock(import('@/platform/telemetry/reportError'), () => ({ reportError: mockReportError })) diff --git a/src/stores/modelStore.test.ts b/src/stores/modelStore.test.ts index 0d60a0d57a8..d3340ed65b8 100644 --- a/src/stores/modelStore.test.ts +++ b/src/stores/modelStore.test.ts @@ -18,17 +18,14 @@ const mockDistribution = vi.hoisted( (): { isCloud: typeof DistributionTypes.isCloud } => ({ isCloud: false }) ) -vi.mock( - import('@/platform/distribution/types'), - () => mockDistribution -) +vi.mock(import('@/platform/distribution/types'), () => mockDistribution) const remoteConfigHolder = await vi.hoisted(async () => { const { ref } = await import('vue') return { current: ref({}) } }) -vi.mock(import('@/platform/remoteConfig/remoteConfig'), () => ({ +vi.mock(import('@/platform/remoteConfig/remoteConfig'), () => ({ get remoteConfig() { return remoteConfigHolder.current } diff --git a/src/stores/workspace/sidebarTabStore.test.ts b/src/stores/workspace/sidebarTabStore.test.ts index 8a3c0eaaeb0..db4aedc6054 100644 --- a/src/stores/workspace/sidebarTabStore.test.ts +++ b/src/stores/workspace/sidebarTabStore.test.ts @@ -21,7 +21,7 @@ vi.mock(import('@/composables/useFeatureFlags'), () => ({ }) })) -vi.mock( +vi.mock( import('@/platform/assets/composables/openModelLibraryBrowser'), () => ({ openModelLibraryBrowser: mockOpenModelLibraryBrowser diff --git a/src/workbench/extensions/agent/AgentPanelRoot.test.ts b/src/workbench/extensions/agent/AgentPanelRoot.test.ts index e48ba475b34..3e4e37e2644 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.test.ts +++ b/src/workbench/extensions/agent/AgentPanelRoot.test.ts @@ -13,7 +13,7 @@ import { computed, defineComponent, h, nextTick, ref } from 'vue' import { useClipboard } from '@vueuse/core' vi.mock(import('firebase/auth')) -vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) +vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) import { i18n } from '@/i18n' import { useAgentConsentStore } from '@/workbench/extensions/agent/stores/agent/agentConsentStore' @@ -215,7 +215,7 @@ vi.mock(import('@/platform/telemetry'), () => ({ useTelemetry: () => telemetry })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) diff --git a/src/workbench/extensions/agent/composables/agent/useAgentConsent.test.ts b/src/workbench/extensions/agent/composables/agent/useAgentConsent.test.ts index 9f7c98fc790..d064575ab8b 100644 --- a/src/workbench/extensions/agent/composables/agent/useAgentConsent.test.ts +++ b/src/workbench/extensions/agent/composables/agent/useAgentConsent.test.ts @@ -1,5 +1,5 @@ vi.mock(import('firebase/auth')) -vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) +vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) import type { GlobalSetting } from '@comfyorg/ingest-types' import { useAuthStore } from '@/stores/authStore' import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore' @@ -32,11 +32,11 @@ vi.mock(import('@/composables/auth/useCurrentUser'), () => ({ }) })) -vi.mock(import('@/config/comfyApi'), () => ({ +vi.mock(import('@/config/comfyApi'), () => ({ getComfyApiBaseUrl: () => 'https://api.comfy.test' })) -vi.mock(import('@/platform/distribution/types'), () => ({ +vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: false })) @@ -56,7 +56,7 @@ vi.mock(import('@/services/dialogService'), () => ({ })) const reportError = vi.hoisted(() => vi.fn()) -vi.mock(import('@/platform/telemetry/reportError'), () => ({ +vi.mock(import('@/platform/telemetry/reportError'), () => ({ reportError })) diff --git a/src/workbench/extensions/agent/stores/agent/agentConsentStore.test.ts b/src/workbench/extensions/agent/stores/agent/agentConsentStore.test.ts index 724ede08bc6..b6ee75ee7eb 100644 --- a/src/workbench/extensions/agent/stores/agent/agentConsentStore.test.ts +++ b/src/workbench/extensions/agent/stores/agent/agentConsentStore.test.ts @@ -1,5 +1,5 @@ vi.mock(import('firebase/auth')) -vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) +vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() })) import type { GlobalSetting } from '@comfyorg/ingest-types' import { useAuthStore } from '@/stores/authStore' import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore' @@ -11,7 +11,7 @@ const accountApi = vi.hoisted(() => ({ get: vi.fn(), set: vi.fn() })) -vi.mock(import('@/platform/settings/globalSettingsApi'), () => ({ +vi.mock(import('@/platform/settings/globalSettingsApi'), () => ({ getGlobalSetting: accountApi.get, setGlobalSetting: accountApi.set })) diff --git a/src/workbench/extensions/agent/stores/agent/agentPanelTarget.test.ts b/src/workbench/extensions/agent/stores/agent/agentPanelTarget.test.ts index 471b1e72af1..7619359d4d6 100644 --- a/src/workbench/extensions/agent/stores/agent/agentPanelTarget.test.ts +++ b/src/workbench/extensions/agent/stores/agent/agentPanelTarget.test.ts @@ -4,7 +4,7 @@ import { nextTick } from 'vue' import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' import { useAgentPanelStore } from './agentPanelStore' -vi.mock(import('@/platform/telemetry'), () => ({ +vi.mock(import('@/platform/telemetry'), () => ({ useTelemetry: () => null })) From 86b2779ceb9138686a278fe79d2d31a96699d9a5 Mon Sep 17 00:00:00 2001 From: Amp Date: Mon, 14 Sep 2026 23:09:07 +0000 Subject: [PATCH 2/3] test: keep audit tooling out of mock cleanup PR Amp-Thread-ID: https://ampcode.com/threads/T-01a0a1fc-e4c8-761d-af9d-c4326e10cba9 --- docs/guidance/vitest.md | 14 ------- scripts/auditMockFactories.test.ts | 38 ------------------- scripts/auditMockFactories.ts | 60 ------------------------------ 3 files changed, 112 deletions(-) delete mode 100644 scripts/auditMockFactories.test.ts delete mode 100644 scripts/auditMockFactories.ts diff --git a/docs/guidance/vitest.md b/docs/guidance/vitest.md index b01d9264bfe..797608fc650 100644 --- a/docs/guidance/vitest.md +++ b/docs/guidance/vitest.md @@ -30,20 +30,6 @@ ESLint rule enforces the Testing Library query rule. Do not disable it. - Module-scope `vi.fn()` declarations may provide reset-persistent defaults by passing the implementation directly to `vi.fn(implementation)`. -### Audit legacy mock factories - -Run `pnpm exec tsx scripts/auditMockFactories.ts` from the repository root to -list `vi.mock` and `vi.doMock` calls in tracked TypeScript -files under `src`. The JSON output includes the module and source lines, -including multiline calls, and excludes comments and string contents. - -First remove `` and run `pnpm typecheck`. If a literal export widens -to `string`, annotate the factory's return type as `Partial` -using `import type * as Module from '…'`. This context checks literal exports -without an inline `import()` type or a cast. Leave missing instance members -and incompatible signatures for a typed fixture repair rather than replacing -the escape with a cast or an untyped module path. - ## No Real Network `vitest.setup.ts` blocks every `http(s)` `fetch`, and happy-dom is configured not diff --git a/scripts/auditMockFactories.test.ts b/scripts/auditMockFactories.test.ts deleted file mode 100644 index 9f49d9a000e..00000000000 --- a/scripts/auditMockFactories.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { findUntypedMockFactories } from './auditMockFactories' - -describe('findUntypedMockFactories', () => { - it.for([ - ["vi.mock(import('./app'), () => ({}))", './app'], - ["vi.doMock('./api', () => ({}))", './api'], - ['vi.mock(modulePath, () => ({}))', ''] - ])('reports %s', ([source, module]) => { - expect(findUntypedMockFactories('example.test.ts', source)).toEqual([ - { file: 'example.test.ts', line: 1, endLine: 1, module } - ]) - }) - - it('finds nested multiline calls and ignores lookalikes', () => { - const source = [ - '// vi.mock(import("./comment"), () => ({}))', - 'const text = "vi.mock(import(\'./string\'), () => ({}))"', - 'vi.mock(import("./typed"), () => ({}))', - 'vi.mock(import("./other-type"), () => ({}))', - 'other.mock(import("./other-object"), () => ({}))', - 'vi.fn()', - 'function setup() {', - ' vi.doMock<', - ' unknown', - ' >(', - ' import("./nested"),', - ' () => ({})', - ' )', - '}' - ].join('\r\n') - - expect(findUntypedMockFactories('nested.test.ts', source)).toEqual([ - { file: 'nested.test.ts', line: 8, endLine: 13, module: './nested' } - ]) - }) -}) diff --git a/scripts/auditMockFactories.ts b/scripts/auditMockFactories.ts deleted file mode 100644 index 6fa5170f7bc..00000000000 --- a/scripts/auditMockFactories.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { execFileSync } from 'node:child_process' -import { readFileSync } from 'node:fs' -import { pathToFileURL } from 'node:url' - -import * as ts from 'typescript' - -export function findUntypedMockFactories(file: string, text: string) { - const source = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true) - const sites: { - file: string - line: number - endLine: number - module: string - }[] = [] - - function visit(node: ts.Node) { - if ( - ts.isCallExpression(node) && - ts.isPropertyAccessExpression(node.expression) && - ts.isIdentifier(node.expression.expression) && - node.expression.expression.text === 'vi' && - ['mock', 'doMock'].includes(node.expression.name.text) && - node.typeArguments?.length === 1 && - node.typeArguments[0].kind === ts.SyntaxKind.UnknownKeyword - ) { - const argument = node.arguments[0] - const module = - argument && - ts.isCallExpression(argument) && - argument.expression.kind === ts.SyntaxKind.ImportKeyword - ? argument.arguments[0] - : argument - sites.push({ - file, - line: source.getLineAndCharacterOfPosition(node.getStart()).line + 1, - endLine: source.getLineAndCharacterOfPosition(node.end).line + 1, - module: module && ts.isStringLiteral(module) ? module.text : '' - }) - } - ts.forEachChild(node, visit) - } - - visit(source) - return sites -} - -if ( - process.argv[1] && - import.meta.url === pathToFileURL(process.argv[1]).href -) { - const files = execFileSync('git', ['ls-files', '-z', 'src'], { - encoding: 'utf8' - }) - .split('\0') - .filter((file) => /\.tsx?$/.test(file)) - const sites = files.flatMap((file) => - findUntypedMockFactories(file, readFileSync(file, 'utf8')) - ) - console.log(JSON.stringify(sites, null, 2)) -} From fab0bd5f54cc084f0f97db3754c1a754cd5f3964 Mon Sep 17 00:00:00 2001 From: Amp Date: Tue, 15 Sep 2026 00:00:30 +0000 Subject: [PATCH 3/3] test: simplify mock literals with const assertions --- .../node/useNodeAnimatedImage.test.ts | 5 +---- ...DesktopCloudNotificationController.test.ts | 14 +++++++------- .../components/MissingModelCard.test.ts | 18 +++++++++--------- .../missingModel/missingModelDownload.test.ts | 19 +++++++++---------- .../apiKeyAuthStore.integration.test.ts | 12 ++++++------ 5 files changed, 32 insertions(+), 36 deletions(-) diff --git a/src/composables/node/useNodeAnimatedImage.test.ts b/src/composables/node/useNodeAnimatedImage.test.ts index 82fded940eb..2951e70c3b6 100644 --- a/src/composables/node/useNodeAnimatedImage.test.ts +++ b/src/composables/node/useNodeAnimatedImage.test.ts @@ -2,7 +2,6 @@ import { describe, expect, it, onTestFinished, vi } from 'vitest' import { useNodeAnimatedImage } from '@/composables/node/useNodeAnimatedImage' import { createMockMediaNode } from '@/renderer/extensions/vueNodes/widgets/composables/domWidgetTestUtils' -import type * as AppModule from '@/scripts/app' const { canvasInteractionsMock } = vi.hoisted(() => ({ canvasInteractionsMock: { @@ -25,9 +24,7 @@ vi.mock( // that we cannot pull in here, so we stub only the constant we need. vi.mock( import('@/scripts/app'), - (): Partial => ({ - ANIM_PREVIEW_WIDGET: '$$comfy_animation_preview' - }) + () => ({ ANIM_PREVIEW_WIDGET: '$$comfy_animation_preview' }) as const ) describe('useNodeAnimatedImage', () => { diff --git a/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts b/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts index 377c6b62ead..bccca1eae20 100644 --- a/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts +++ b/src/platform/cloud/notification/components/DesktopCloudNotificationController.test.ts @@ -2,7 +2,6 @@ import { render } from '@testing-library/vue' import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' import { useSettingStore } from '@/platform/settings/settingStore' -import type * as DistributionTypes from '@/platform/distribution/types' import DesktopCloudNotificationController from './DesktopCloudNotificationController.vue' @@ -20,12 +19,13 @@ const errorReporter = vi.hoisted(() => vi.fn()) vi.mock( import('@/platform/distribution/types'), - (): Partial => ({ - DISTRIBUTION: 'desktop', - isCloud: false, - isDesktop: true, - isNightly: false - }) + () => + ({ + DISTRIBUTION: 'desktop', + isCloud: false, + isDesktop: true, + isNightly: false + }) as const ) vi.mock(import('@/platform/telemetry/reportError'), () => ({ diff --git a/src/platform/missingModel/components/MissingModelCard.test.ts b/src/platform/missingModel/components/MissingModelCard.test.ts index cc988b8a2f3..dc6bd073ded 100644 --- a/src/platform/missingModel/components/MissingModelCard.test.ts +++ b/src/platform/missingModel/components/MissingModelCard.test.ts @@ -7,7 +7,6 @@ import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import type * as DistributionTypes from '@/platform/distribution/types' import type { MissingModelGroup, MissingModelViewModel @@ -47,14 +46,15 @@ vi.mock(import('./MissingModelRow.vue'), () => ({ const mockIsCloud = vi.hoisted(() => ({ value: true })) vi.mock( import('@/platform/distribution/types'), - (): Partial => ({ - DISTRIBUTION: 'cloud', - get isCloud() { - return mockIsCloud.value - }, - isDesktop: false, - isNightly: false - }) + () => + ({ + DISTRIBUTION: 'cloud', + get isCloud() { + return mockIsCloud.value + }, + isDesktop: false, + isNightly: false + }) as const ) import MissingModelCard from './MissingModelCard.vue' diff --git a/src/platform/missingModel/missingModelDownload.test.ts b/src/platform/missingModel/missingModelDownload.test.ts index 18ec961569e..6ccc84f6855 100644 --- a/src/platform/missingModel/missingModelDownload.test.ts +++ b/src/platform/missingModel/missingModelDownload.test.ts @@ -2,8 +2,6 @@ import { useElectronDownloadStore } from '@/stores/electronDownloadStore' import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as DistributionTypes from '@/platform/distribution/types' - import { clearMetadataCache, downloadModel, @@ -22,14 +20,15 @@ const { fetchMock, mockIsDesktop, mockStartDownload } = vi.hoisted(() => ({ vi.mock( import('@/platform/distribution/types'), - (): Partial => ({ - DISTRIBUTION: 'localhost', - isCloud: false, - get isDesktop() { - return mockIsDesktop.value - }, - isNightly: false - }) + () => + ({ + DISTRIBUTION: 'localhost', + isCloud: false, + get isDesktop() { + return mockIsDesktop.value + }, + isNightly: false + }) as const ) beforeEach(() => { diff --git a/src/stores/apiKeyAuthStore.integration.test.ts b/src/stores/apiKeyAuthStore.integration.test.ts index 78e3df0720e..25c0b44f011 100644 --- a/src/stores/apiKeyAuthStore.integration.test.ts +++ b/src/stores/apiKeyAuthStore.integration.test.ts @@ -3,7 +3,6 @@ import * as firebaseAuth from 'firebase/auth' import { beforeEach, describe, expect, it, vi } from 'vitest' import * as vuefire from 'vuefire' -import type * as DistributionTypes from '@/platform/distribution/types' import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore' import { useAuthStore } from '@/stores/authStore' @@ -17,11 +16,12 @@ vi.mock(import('firebase/auth')) vi.mock( import('@/platform/distribution/types'), - (): Partial => ({ - DISTRIBUTION: 'cloud', - isCloud: true, - isDesktop: false - }) + () => + ({ + DISTRIBUTION: 'cloud', + isCloud: true, + isDesktop: false + }) as const ) vi.mock(import('@/composables/useFeatureFlags'), () => ({