From 51fae10282ba513f136e1d775155319f6531a5c8 Mon Sep 17 00:00:00 2001 From: Amp Date: Thu, 17 Sep 2026 22:36:32 +0000 Subject: [PATCH 01/10] test: add second automock foundation batch Amp-Thread-ID: https://ampcode.com/threads/T-01a0b16b-c4e5-711c-bd0e-e884de3c8631 --- .../billing/useBillingContext.test.ts | 65 ++++------------ .../node/__mocks__/useNodeDragToCanvas.ts | 22 ++++++ .../node/startModelNodeDragFromAsset.test.ts | 15 ++-- src/composables/node/useNodeImage.test.ts | 28 ++----- src/composables/useCoreCommands.test.ts | 35 ++------- .../composables/__mocks__/useSubscription.ts | 41 ++++++++++ .../remoteConfig/__mocks__/remoteConfig.ts | 77 +++++++++++++++++++ .../__mocks__/useSettingsDialog.ts | 11 +++ .../canvas/__mocks__/useCanvasInteractions.ts | 23 ++++++ .../layout/__tests__/TransformPane.test.ts | 28 +------ .../transform/__mocks__/useTransformState.ts | 27 +++++++ .../vueNodes/components/LGraphNode.test.ts | 16 +--- src/services/__mocks__/litegraphService.ts | 28 +++++++ src/utils/__mocks__/graphTraversalUtil.ts | 45 +++++++++++ 14 files changed, 317 insertions(+), 144 deletions(-) create mode 100644 src/composables/node/__mocks__/useNodeDragToCanvas.ts create mode 100644 src/platform/cloud/subscription/composables/__mocks__/useSubscription.ts create mode 100644 src/platform/remoteConfig/__mocks__/remoteConfig.ts create mode 100644 src/platform/settings/composables/__mocks__/useSettingsDialog.ts create mode 100644 src/renderer/core/canvas/__mocks__/useCanvasInteractions.ts create mode 100644 src/renderer/core/layout/transform/__mocks__/useTransformState.ts create mode 100644 src/services/__mocks__/litegraphService.ts create mode 100644 src/utils/__mocks__/graphTraversalUtil.ts diff --git a/src/composables/billing/useBillingContext.test.ts b/src/composables/billing/useBillingContext.test.ts index dd19f58c693..270dc2e2cf4 100644 --- a/src/composables/billing/useBillingContext.test.ts +++ b/src/composables/billing/useBillingContext.test.ts @@ -5,6 +5,7 @@ import { storeToRefs } from 'pinia' import { fromPartial } from '@total-typescript/shoehorn' import { useAuthActions } from '@/composables/auth/useAuthActions' import { useAuthStore } from '@/stores/authStore' +import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription' import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore' import { workspaceApi } from '@/platform/workspace/api/workspaceApi' @@ -39,14 +40,7 @@ const DEFAULT_BILLING_STATUS: BillingStatusResponse = { subscription_duration: 'MONTHLY' } -const { - mockPlans, - mockFetchPlans, - mockLegacyFetchStatus, - mockLegacySubscribe, - mockLegacyStatus, - mockBillingStatus -} = vi.hoisted(() => { +const { mockPlans, mockFetchPlans, mockBillingStatus } = vi.hoisted(() => { const mockBillingStatus: { value: Partial } = { value: { is_active: true, @@ -58,15 +52,6 @@ const { return { mockPlans: { value: [] as Plan[] }, mockFetchPlans: vi.fn(async () => undefined), - mockLegacyFetchStatus: vi.fn(async () => undefined), - mockLegacySubscribe: vi.fn(async () => undefined), - mockLegacyStatus: { - value: { - is_active: true, - has_funds: true, - renewal_date: '2025-01-01T00:00:00Z' - } as BillingStatusResponse - }, mockBillingStatus } }) @@ -76,30 +61,8 @@ let mockBillingRail: Ref vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) -vi.mock( - import('@/platform/cloud/subscription/composables/useSubscription'), - () => ({ - useSubscription: () => ({ - canAccessSubscriptionFeatures: { value: true }, - subscriptionTier: { value: 'PRO' }, - subscriptionDuration: { value: 'MONTHLY' }, - subscriptionStatus: { - get value() { - return mockLegacyStatus.value - } - }, - isCancelled: { - get value() { - return Boolean(mockLegacyStatus.value.cancel_at) - } - }, - fetchStatus: mockLegacyFetchStatus, - manageSubscription: vi.fn(async () => undefined), - subscribe: mockLegacySubscribe, - showSubscriptionDialog: vi.fn() - }) - }) -) +vi.mock(import('@/platform/cloud/subscription/composables/useSubscription')) +vi.mock(import('@/platform/remoteConfig/remoteConfig')) vi.mock( import('@/platform/cloud/subscription/composables/useSubscriptionDialog'), @@ -172,7 +135,8 @@ describe('useBillingContext', () => { mockBillingRail.value = billingRail }) mockPlans.value = [] - mockLegacyStatus.value = { + const subscription = useSubscription() + subscription.subscriptionStatus.value = { is_active: true, has_funds: true, max_seats: 0, @@ -181,6 +145,11 @@ describe('useBillingContext', () => { scheduled_change: null, renewal_date: '2025-01-01T00:00:00Z' } + subscription.subscriptionTier = computed(() => 'PRO') + subscription.subscriptionDuration = computed(() => 'MONTHLY') + subscription.isCancelled = computed(() => + Boolean(subscription.subscriptionStatus.value?.cancel_at) + ) mockBillingStatus.value = { ...DEFAULT_BILLING_STATUS } }) @@ -230,7 +199,7 @@ describe('useBillingContext', () => { it('passes canonical status fields through legacy billing', () => { mockBillingRail.value = 'legacy_stripe' - mockLegacyStatus.value = { + useSubscription().subscriptionStatus.value = { ...DEFAULT_BILLING_STATUS, billing_status: 'payment_failed', subscription_status: 'ended', @@ -318,7 +287,7 @@ describe('useBillingContext', () => { await context.fetchStatus() expect(mockFetchPlans).toHaveBeenCalledOnce() - expect(mockLegacyFetchStatus).toHaveBeenCalled() + expect(useSubscription().fetchStatus).toHaveBeenCalled() expect(workspaceApi.getBillingStatus).not.toHaveBeenCalled() await context.previewSubscribe('creator-annual') @@ -333,7 +302,7 @@ describe('useBillingContext', () => { 'creator-annual', undefined ) - expect(mockLegacySubscribe).not.toHaveBeenCalled() + expect(useSubscription().subscribe).not.toHaveBeenCalled() expect(useAuthActions().purchaseCredits).toHaveBeenCalledWith(5) }) @@ -362,7 +331,7 @@ describe('useBillingContext', () => { const context = useBillingContext() await vi.waitFor(() => { - expect(mockLegacyFetchStatus).toHaveBeenCalled() + expect(useSubscription().fetchStatus).toHaveBeenCalled() expect(vi.mocked(useAuthStore().fetchBalance)).toHaveBeenCalled() }) vi.clearAllMocks() @@ -375,7 +344,7 @@ describe('useBillingContext', () => { expect(context.type.value).toBe('workspace') expect(workspaceApi.getBillingStatus).toHaveBeenCalled() expect(workspaceApi.getBillingBalance).toHaveBeenCalled() - expect(mockLegacyFetchStatus).not.toHaveBeenCalled() + expect(useSubscription().fetchStatus).not.toHaveBeenCalled() expect(vi.mocked(useAuthStore().fetchBalance)).not.toHaveBeenCalled() }) @@ -384,7 +353,7 @@ describe('useBillingContext', () => { const context = useBillingContext() await vi.waitFor(() => { - expect(mockLegacyFetchStatus).toHaveBeenCalled() + expect(useSubscription().fetchStatus).toHaveBeenCalled() expect(vi.mocked(useAuthStore().fetchBalance)).toHaveBeenCalled() }) vi.clearAllMocks() diff --git a/src/composables/node/__mocks__/useNodeDragToCanvas.ts b/src/composables/node/__mocks__/useNodeDragToCanvas.ts new file mode 100644 index 00000000000..a8291e9c379 --- /dev/null +++ b/src/composables/node/__mocks__/useNodeDragToCanvas.ts @@ -0,0 +1,22 @@ +import { onTestFinished, vi } from 'vitest' +import { ref, shallowRef } from 'vue' + +import type { useNodeDragToCanvas as realUseNodeDragToCanvas } from '../useNodeDragToCanvas' + +const nodeDragToCanvas: ReturnType = { + isDragging: ref(false), + draggedNode: shallowRef(null), + pendingWidgetValues: shallowRef(), + startDrag: vi.fn(), + cancelDrag: vi.fn(), + handleNativeDrop: vi.fn() +} + +export const useNodeDragToCanvas = vi.fn(() => { + onTestFinished(() => { + nodeDragToCanvas.isDragging.value = false + nodeDragToCanvas.draggedNode.value = null + nodeDragToCanvas.pendingWidgetValues.value = undefined + }) + return nodeDragToCanvas +}) diff --git a/src/composables/node/startModelNodeDragFromAsset.test.ts b/src/composables/node/startModelNodeDragFromAsset.test.ts index cac8c7aa1fe..31698664e2b 100644 --- a/src/composables/node/startModelNodeDragFromAsset.test.ts +++ b/src/composables/node/startModelNodeDragFromAsset.test.ts @@ -1,16 +1,13 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { AssetItem } from '@/platform/assets/schemas/assetSchema' +import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas' import { startModelNodeDragFromAsset } from '@/composables/node/startModelNodeDragFromAsset' import { useModelToNodeStore } from '@/stores/modelToNodeStore' import { fromPartial } from '@total-typescript/shoehorn' import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore' -const mockStartDrag = vi.hoisted(() => vi.fn()) - -vi.mock(import('@/composables/node/useNodeDragToCanvas'), () => ({ - useNodeDragToCanvas: () => ({ startDrag: mockStartDrag }) -})) +vi.mock(import('@/composables/node/useNodeDragToCanvas')) function createAsset(overrides: Partial = {}): AssetItem { return { @@ -42,7 +39,7 @@ describe('startModelNodeDragFromAsset', () => { const error = startModelNodeDragFromAsset(createAsset()) expect(error).toBeUndefined() - expect(mockStartDrag).toHaveBeenCalledWith(nodeDef, { + expect(useNodeDragToCanvas().startDrag).toHaveBeenCalledWith(nodeDef, { widgetValues: { ckpt_name: 'sd_xl_base_1.0.safetensors' }, source: 'sidebar_drag' }) @@ -59,7 +56,7 @@ describe('startModelNodeDragFromAsset', () => { startModelNodeDragFromAsset(createAsset(), 'asset_browser') - expect(mockStartDrag).toHaveBeenCalledWith(nodeDef, { + expect(useNodeDragToCanvas().startDrag).toHaveBeenCalledWith(nodeDef, { widgetValues: { ckpt_name: 'sd_xl_base_1.0.safetensors' }, source: 'asset_browser' }) @@ -79,7 +76,7 @@ describe('startModelNodeDragFromAsset', () => { }) ) - expect(mockStartDrag).toHaveBeenCalledWith(nodeDef, { + expect(useNodeDragToCanvas().startDrag).toHaveBeenCalledWith(nodeDef, { widgetValues: undefined, source: 'sidebar_drag' }) @@ -91,6 +88,6 @@ describe('startModelNodeDragFromAsset', () => { const error = startModelNodeDragFromAsset(createAsset()) expect(error?.code).toBe('NO_PROVIDER') - expect(mockStartDrag).not.toHaveBeenCalled() + expect(useNodeDragToCanvas().startDrag).not.toHaveBeenCalled() }) }) diff --git a/src/composables/node/useNodeImage.test.ts b/src/composables/node/useNodeImage.test.ts index 318101c6027..2b8d8a94484 100644 --- a/src/composables/node/useNodeImage.test.ts +++ b/src/composables/node/useNodeImage.test.ts @@ -1,23 +1,11 @@ import { describe, expect, it, onTestFinished, vi } from 'vitest' import { useNodeVideo } from '@/composables/node/useNodeImage' +import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions' import { useNodeOutputStore } from '@/stores/nodeOutputStore' import { createMockMediaNode } from '@/renderer/extensions/vueNodes/widgets/composables/domWidgetTestUtils' -const { canvasInteractionsMock } = vi.hoisted(() => ({ - canvasInteractionsMock: { - handleWheel: vi.fn(), - handlePointerDown: vi.fn(), - handlePointerMove: vi.fn() - } -})) - -vi.mock( - import('@/renderer/core/canvas/useCanvasInteractions'), - () => ({ - useCanvasInteractions: () => canvasInteractionsMock - }) -) +vi.mock(import('@/renderer/core/canvas/useCanvasInteractions')) vi.mock(import('@/utils/imageUtil'), () => ({ fitDimensionsToNodeWidth: () => ({ minHeight: 256, minWidth: 256 }) })) @@ -69,9 +57,9 @@ describe('useNodeVideo', () => { video.dispatchEvent(new PointerEvent('pointermove', { bubbles: true })) video.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true })) - expect(canvasInteractionsMock.handleWheel).toHaveBeenCalledTimes(1) - expect(canvasInteractionsMock.handlePointerMove).toHaveBeenCalledTimes(1) - expect(canvasInteractionsMock.handlePointerDown).toHaveBeenCalledTimes(1) + expect(useCanvasInteractions().handleWheel).toHaveBeenCalledTimes(1) + expect(useCanvasInteractions().handlePointerMove).toHaveBeenCalledTimes(1) + expect(useCanvasInteractions().handlePointerDown).toHaveBeenCalledTimes(1) }) it('detaches every listener when the widget is removed', async () => { @@ -83,8 +71,8 @@ describe('useNodeVideo', () => { video.dispatchEvent(new PointerEvent('pointermove', { bubbles: true })) video.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true })) - expect(canvasInteractionsMock.handleWheel).not.toHaveBeenCalled() - expect(canvasInteractionsMock.handlePointerMove).not.toHaveBeenCalled() - expect(canvasInteractionsMock.handlePointerDown).not.toHaveBeenCalled() + expect(useCanvasInteractions().handleWheel).not.toHaveBeenCalled() + expect(useCanvasInteractions().handlePointerMove).not.toHaveBeenCalled() + expect(useCanvasInteractions().handlePointerDown).not.toHaveBeenCalled() }) }) diff --git a/src/composables/useCoreCommands.test.ts b/src/composables/useCoreCommands.test.ts index 1a79f92c5a3..2b52d12d071 100644 --- a/src/composables/useCoreCommands.test.ts +++ b/src/composables/useCoreCommands.test.ts @@ -16,6 +16,8 @@ import { useModelStore } from '@/stores/modelStore' import { useMissingModelStore } from '@/platform/missingModel/missingModelStore' import { useToastStore } from '@/platform/updates/common/toastStore' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog' +import { useLitegraphService } from '@/services/litegraphService' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' import { fromPartial } from '@total-typescript/shoehorn' @@ -108,26 +110,11 @@ vi.mock( vi.mock(import('@/services/dialogService')) -const mockResetView = vi.hoisted(() => vi.fn()) -vi.mock(import('@/services/litegraphService'), () => ({ - useLitegraphService: vi.fn(() => ({ - resetView: mockResetView - })) -})) +vi.mock(import('@/services/litegraphService')) vi.mock(import('@/platform/telemetry')) -const mockShowAbout = vi.hoisted(() => vi.fn()) -const mockShowSettings = vi.hoisted(() => vi.fn()) -vi.mock( - import('@/platform/settings/composables/useSettingsDialog'), - () => ({ - useSettingsDialog: vi.fn(() => ({ - show: mockShowSettings, - showAbout: mockShowAbout - })) - }) -) +vi.mock(import('@/platform/settings/composables/useSettingsDialog')) vi.mock(import('@/composables/useFeatureFlags')) const mockAssetBrowse = vi.hoisted(() => @@ -153,15 +140,7 @@ let mockWorkflowStore: ReturnType vi.mock(import('@/composables/auth/useAuthActions')) -vi.mock( - import('@/platform/cloud/subscription/composables/useSubscription'), - () => ({ - useSubscription: vi.fn(() => ({ - canAccessSubscriptionFeatures: vi.fn().mockReturnValue(true), - showSubscriptionDialog: vi.fn() - })) - }) -) +vi.mock(import('@/platform/cloud/subscription/composables/useSubscription')) const mockBillingState = vi.hoisted(() => ({ canAccessSubscriptionFeatures: true, @@ -527,7 +506,7 @@ describe('useCoreCommands', () => { it('Comfy.Canvas.ResetView delegates to litegraphService.resetView', async () => { await findCmd('Comfy.Canvas.ResetView').function() - expect(mockResetView).toHaveBeenCalled() + expect(useLitegraphService().resetView).toHaveBeenCalled() }) it('Comfy.Canvas.ZoomIn scales the canvas up by 1.1× and marks it dirty', async () => { @@ -755,7 +734,7 @@ describe('useCoreCommands', () => { it('Comfy.Help.AboutComfyUI opens the About dialog', async () => { await findCmd('Comfy.Help.AboutComfyUI').function() - expect(mockShowAbout).toHaveBeenCalled() + expect(useSettingsDialog().showAbout).toHaveBeenCalled() }) }) diff --git a/src/platform/cloud/subscription/composables/__mocks__/useSubscription.ts b/src/platform/cloud/subscription/composables/__mocks__/useSubscription.ts new file mode 100644 index 00000000000..3c855527ffe --- /dev/null +++ b/src/platform/cloud/subscription/composables/__mocks__/useSubscription.ts @@ -0,0 +1,41 @@ +import { onTestFinished, vi } from 'vitest' +import { computed, ref } from 'vue' + +import type { useSubscription as realUseSubscription } from '../useSubscription' + +function reactiveDefaults() { + return { + canAccessSubscriptionFeatures: computed(() => true), + isInitialized: ref(true), + isCancelled: computed(() => false), + formattedRenewalDate: computed(() => ''), + formattedEndDate: computed(() => ''), + subscriptionTier: computed(() => null), + isFreeTier: computed(() => false), + subscriptionDuration: computed(() => null), + isYearlySubscription: computed(() => false), + subscriptionTierName: computed(() => ''), + subscriptionStatus: ref(null) + } +} + +const subscription: ReturnType = { + ...reactiveDefaults(), + isSubscriptionEnabled: vi.fn(() => false), + subscribe: vi.fn(async () => {}), + subscribeDirect: vi.fn(async () => {}), + fetchStatus: vi.fn(async () => undefined), + showSubscriptionDialog: vi.fn(), + manageSubscription: vi.fn(async () => {}), + requireActiveSubscription: vi.fn(async () => {}), + handleViewUsageHistory: vi.fn(), + handleLearnMore: vi.fn(), + handleInvoiceHistory: vi.fn(async () => {}) +} + +export const useSubscription = vi.fn(() => { + onTestFinished(() => { + Object.assign(subscription, reactiveDefaults()) + }) + return subscription +}) diff --git a/src/platform/remoteConfig/__mocks__/remoteConfig.ts b/src/platform/remoteConfig/__mocks__/remoteConfig.ts new file mode 100644 index 00000000000..f14ee28801e --- /dev/null +++ b/src/platform/remoteConfig/__mocks__/remoteConfig.ts @@ -0,0 +1,77 @@ +import { onTestFinished } from 'vitest' +import { computed, customRef } from 'vue' + +import * as realRemoteConfig from '../remoteConfig' + +function testScopedRef(defaultValue: T) { + let value = defaultValue + let restoring = false + + return customRef((track, trigger) => ({ + get() { + track() + return value + }, + set(nextValue) { + value = nextValue + trigger() + if (restoring) return + + onTestFinished(() => { + restoring = true + value = defaultValue + trigger() + restoring = false + }) + } + })) +} + +function testScopedRemovableRef(defaultValue: T) { + const scopedRef = testScopedRef(defaultValue) + return Object.assign(scopedRef, { + remove: () => { + scopedRef.value = defaultValue + } + }) +} + +const remoteConfigRef = testScopedRef< + typeof realRemoteConfig.remoteConfig.value +>({}) +const remoteConfigStateRef = + testScopedRef('unloaded') +const remoteConfigErrorStatusRef = testScopedRef(null) +const cachedBillingControlEnabledRef = testScopedRemovableRef< + boolean | undefined +>(undefined) +const cachedLegacyBillingMigrationEnabledRef = testScopedRef< + boolean | undefined +>(undefined) +const cachedV1PaymentRecoveryRef = testScopedRemovableRef( + undefined +) + +const remoteConfigModule: typeof realRemoteConfig = { + ...realRemoteConfig, + remoteConfig: remoteConfigRef, + remoteConfigState: remoteConfigStateRef, + remoteConfigErrorStatus: remoteConfigErrorStatusRef, + isAuthenticatedConfigLoaded: computed( + () => remoteConfigStateRef.value === 'authenticated' + ), + cachedBillingControlEnabled: cachedBillingControlEnabledRef, + cachedLegacyBillingMigrationEnabled: cachedLegacyBillingMigrationEnabledRef, + cachedV1PaymentRecovery: cachedV1PaymentRecoveryRef +} + +export const { + remoteConfigState, + remoteConfigErrorStatus, + isAuthenticatedConfigLoaded, + remoteConfig, + configValueOrDefault, + cachedBillingControlEnabled, + cachedLegacyBillingMigrationEnabled, + cachedV1PaymentRecovery +} = remoteConfigModule diff --git a/src/platform/settings/composables/__mocks__/useSettingsDialog.ts b/src/platform/settings/composables/__mocks__/useSettingsDialog.ts new file mode 100644 index 00000000000..5f36b56e75b --- /dev/null +++ b/src/platform/settings/composables/__mocks__/useSettingsDialog.ts @@ -0,0 +1,11 @@ +import { vi } from 'vitest' + +import type { useSettingsDialog as realUseSettingsDialog } from '../useSettingsDialog' + +const settingsDialog: ReturnType = { + show: vi.fn(), + hide: vi.fn(), + showAbout: vi.fn() +} + +export const useSettingsDialog = vi.fn(() => settingsDialog) diff --git a/src/renderer/core/canvas/__mocks__/useCanvasInteractions.ts b/src/renderer/core/canvas/__mocks__/useCanvasInteractions.ts new file mode 100644 index 00000000000..c10a0a93ea1 --- /dev/null +++ b/src/renderer/core/canvas/__mocks__/useCanvasInteractions.ts @@ -0,0 +1,23 @@ +import { onTestFinished, vi } from 'vitest' +import { computed } from 'vue' + +import type { useCanvasInteractions as realUseCanvasInteractions } from '../useCanvasInteractions' + +const shouldHandleNodePointerEvents = computed(() => true) + +const canvasInteractions: ReturnType = { + handleWheel: vi.fn(), + handlePointerDown: vi.fn(), + handlePointerMove: vi.fn(), + handlePointerUp: vi.fn(), + forwardEventToCanvas: vi.fn(), + shouldHandleNodePointerEvents +} + +export const useCanvasInteractions = vi.fn(() => { + onTestFinished(() => { + canvasInteractions.shouldHandleNodePointerEvents = + shouldHandleNodePointerEvents + }) + return canvasInteractions +}) diff --git a/src/renderer/core/layout/__tests__/TransformPane.test.ts b/src/renderer/core/layout/__tests__/TransformPane.test.ts index ee98e13df71..f9f62eb08a3 100644 --- a/src/renderer/core/layout/__tests__/TransformPane.test.ts +++ b/src/renderer/core/layout/__tests__/TransformPane.test.ts @@ -7,29 +7,7 @@ import { createMockCanvas } from '@/utils/__tests__/litegraphTestUtils' import TransformPane from '../transform/TransformPane.vue' -const mockData = vi.hoisted(() => ({ - mockTransformStyle: { - transform: 'scale(1) translate(0px, 0px)', - transformOrigin: '0 0' - }, - mockCamera: { x: 0, y: 0, z: 1 } -})) - -vi.mock( - import('@/renderer/core/layout/transform/useTransformState'), - () => { - const syncWithCanvas = vi.fn() - return { - useTransformState: () => ({ - camera: computed(() => mockData.mockCamera), - transformStyle: computed(() => mockData.mockTransformStyle), - screenToCanvas: vi.fn(), - isNodeInViewport: vi.fn(), - syncWithCanvas - }) - } - } -) +vi.mock(import('@/renderer/core/layout/transform/useTransformState')) function createMockLGraphCanvas() { return createMockCanvas({ @@ -58,10 +36,10 @@ describe('TransformPane', () => { }) it('should apply transform style from composable', async () => { - mockData.mockTransformStyle = { + useTransformState().transformStyle = computed(() => ({ transform: 'scale(2) translate(100px, 50px)', transformOrigin: '0 0' - } + })) const mockCanvas = createMockLGraphCanvas() render(TransformPane, { diff --git a/src/renderer/core/layout/transform/__mocks__/useTransformState.ts b/src/renderer/core/layout/transform/__mocks__/useTransformState.ts new file mode 100644 index 00000000000..bc748858e5b --- /dev/null +++ b/src/renderer/core/layout/transform/__mocks__/useTransformState.ts @@ -0,0 +1,27 @@ +import { onTestFinished, vi } from 'vitest' +import { computed, reactive, readonly } from 'vue' + +import type { useTransformState as realUseTransformState } from '../useTransformState' + +function reactiveDefaults() { + return { + camera: readonly(reactive({ x: 0, y: 0, z: 1 })), + transformStyle: computed(() => ({ + transform: 'scale3d(1, 1, 1) translate3d(0px, 0px, 0)', + transformOrigin: '0 0' + })) + } +} + +const transformState: ReturnType = { + ...reactiveDefaults(), + syncWithCanvas: vi.fn(), + screenToCanvas: vi.fn(({ x, y }) => ({ x, y })) +} + +export const useTransformState = vi.fn(() => { + onTestFinished(() => { + Object.assign(transformState, reactiveDefaults()) + }) + return transformState +}) diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts index 04c03076d5b..92ebd1e405c 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts @@ -41,26 +41,14 @@ const mockData = vi.hoisted(() => ({ resizeCallback: null as ResizeCallback | null })) -vi.mock(import('@/utils/graphTraversalUtil'), { spy: true }) +vi.mock(import('@/utils/graphTraversalUtil')) vi.mocked(getNodeByLocatorId).mockImplementation(() => fromAny( mockData.mockLgraphNode ?? { isSubgraphNode: () => false } ) ) -vi.mock( - import('@/renderer/core/layout/transform/useTransformState'), - () => { - return { - useTransformState: () => ({ - screenToCanvas: vi.fn(), - canvasToScreen: vi.fn(), - camera: { z: 1 }, - isNodeInViewport: vi.fn() - }) - } - } -) +vi.mock(import('@/renderer/core/layout/transform/useTransformState')) vi.mock( import('@/renderer/extensions/vueNodes/composables/useNodeEventHandlers'), diff --git a/src/services/__mocks__/litegraphService.ts b/src/services/__mocks__/litegraphService.ts new file mode 100644 index 00000000000..d230981671f --- /dev/null +++ b/src/services/__mocks__/litegraphService.ts @@ -0,0 +1,28 @@ +import { vi } from 'vitest' + +import type { + getExtraOptionsForWidget as realGetExtraOptionsForWidget, + useLitegraphService as realUseLitegraphService +} from '../litegraphService' + +export const CONFIG = Symbol() +export const GET_CONFIG = Symbol() + +export const getExtraOptionsForWidget = vi.fn< + typeof realGetExtraOptionsForWidget +>(() => []) + +const litegraphService: ReturnType = { + registerNodeDef: vi.fn(async () => {}), + registerSubgraphNodeDef: vi.fn(), + addNodeOnGraph: vi.fn(() => null), + addNodeInput: vi.fn(), + getCanvasCenter: vi.fn(() => [0, 0] satisfies [number, number]), + getExtraOptionsForWidget, + goToNode: vi.fn(), + resetView: vi.fn(), + fitView: vi.fn(), + updatePreviews: vi.fn() +} + +export const useLitegraphService = vi.fn(() => litegraphService) diff --git a/src/utils/__mocks__/graphTraversalUtil.ts b/src/utils/__mocks__/graphTraversalUtil.ts new file mode 100644 index 00000000000..d84ba3d8924 --- /dev/null +++ b/src/utils/__mocks__/graphTraversalUtil.ts @@ -0,0 +1,45 @@ +import { vi } from 'vitest' + +import type { getNodeByLocatorId as realGetNodeByLocatorId } from '../graphTraversalUtil' + +export { + collectAllNodes, + collectFromNodes, + executionIdFromState, + executionIdToNodeLocatorId, + findNodeInHierarchy, + findSubgraphByUuid, + findSubgraphNodePathById, + findSubgraphPathById, + forEachNode, + forEachSubgraphNode, + getActiveGraphNodeIds, + getAllNonIoNodesInSubgraph, + getExecutionIdByNode, + getExecutionIdForNodeInGraph, + getExecutionIdsForSelectedNodes, + getLocalNodeIdFromExecutionId, + getNodeByExecutionId, + getRootGraph, + getRootParentNode, + getSubgraphPathFromExecutionId, + isAncestorPathActive, + isCandidateScopeActive, + isExecutionPathActive, + isMissingCandidateActive, + locatorIdFromState, + mapAllNodes, + mapSubgraphNodes, + mapUniqueNodes, + parseExecutionId, + reduceAllNodes, + subgraphIdFromState, + traverseNodesDepthFirst, + traverseSubgraphPath, + triggerCallbackOnAllNodes, + visitGraphNodes +} from '../graphTraversalUtil' + +export const getNodeByLocatorId = vi.fn( + () => null +) From 9a22eab50c691c6fc442da287d14b6d2a87d6ab6 Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 01:35:57 +0000 Subject: [PATCH 02/10] test: avoid remote config runtime import Amp-Thread-ID: https://ampcode.com/threads/T-01a0b16b-c4e5-711c-bd0e-e884de3c8631 --- src/platform/remoteConfig/__mocks__/remoteConfig.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/platform/remoteConfig/__mocks__/remoteConfig.ts b/src/platform/remoteConfig/__mocks__/remoteConfig.ts index f14ee28801e..fa538581e06 100644 --- a/src/platform/remoteConfig/__mocks__/remoteConfig.ts +++ b/src/platform/remoteConfig/__mocks__/remoteConfig.ts @@ -1,7 +1,7 @@ import { onTestFinished } from 'vitest' import { computed, customRef } from 'vue' -import * as realRemoteConfig from '../remoteConfig' +import type * as realRemoteConfig from '../remoteConfig' function testScopedRef(defaultValue: T) { let value = defaultValue @@ -53,13 +53,15 @@ const cachedV1PaymentRecoveryRef = testScopedRemovableRef( ) const remoteConfigModule: typeof realRemoteConfig = { - ...realRemoteConfig, remoteConfig: remoteConfigRef, remoteConfigState: remoteConfigStateRef, remoteConfigErrorStatus: remoteConfigErrorStatusRef, isAuthenticatedConfigLoaded: computed( () => remoteConfigStateRef.value === 'authenticated' ), + configValueOrDefault(remoteConfig, key, defaultValue) { + return remoteConfig[key] || defaultValue + }, cachedBillingControlEnabled: cachedBillingControlEnabledRef, cachedLegacyBillingMigrationEnabled: cachedLegacyBillingMigrationEnabledRef, cachedV1PaymentRecovery: cachedV1PaymentRecoveryRef From fb2284a9005cfa12594a6e67a0ab34d327ba6f46 Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 01:41:31 +0000 Subject: [PATCH 03/10] test: centralize remote config mock typing Amp-Thread-ID: https://ampcode.com/threads/T-01a0b16b-c4e5-711c-bd0e-e884de3c8631 --- .../remoteConfig/__mocks__/remoteConfig.ts | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/platform/remoteConfig/__mocks__/remoteConfig.ts b/src/platform/remoteConfig/__mocks__/remoteConfig.ts index fa538581e06..ddf78429555 100644 --- a/src/platform/remoteConfig/__mocks__/remoteConfig.ts +++ b/src/platform/remoteConfig/__mocks__/remoteConfig.ts @@ -36,35 +36,20 @@ function testScopedRemovableRef(defaultValue: T) { }) } -const remoteConfigRef = testScopedRef< - typeof realRemoteConfig.remoteConfig.value ->({}) -const remoteConfigStateRef = +const state = testScopedRef('unloaded') -const remoteConfigErrorStatusRef = testScopedRef(null) -const cachedBillingControlEnabledRef = testScopedRemovableRef< - boolean | undefined ->(undefined) -const cachedLegacyBillingMigrationEnabledRef = testScopedRef< - boolean | undefined ->(undefined) -const cachedV1PaymentRecoveryRef = testScopedRemovableRef( - undefined -) const remoteConfigModule: typeof realRemoteConfig = { - remoteConfig: remoteConfigRef, - remoteConfigState: remoteConfigStateRef, - remoteConfigErrorStatus: remoteConfigErrorStatusRef, - isAuthenticatedConfigLoaded: computed( - () => remoteConfigStateRef.value === 'authenticated' - ), + remoteConfig: testScopedRef({}), + remoteConfigState: state, + remoteConfigErrorStatus: testScopedRef(null), + isAuthenticatedConfigLoaded: computed(() => state.value === 'authenticated'), configValueOrDefault(remoteConfig, key, defaultValue) { return remoteConfig[key] || defaultValue }, - cachedBillingControlEnabled: cachedBillingControlEnabledRef, - cachedLegacyBillingMigrationEnabled: cachedLegacyBillingMigrationEnabledRef, - cachedV1PaymentRecovery: cachedV1PaymentRecoveryRef + cachedBillingControlEnabled: testScopedRemovableRef(undefined), + cachedLegacyBillingMigrationEnabled: testScopedRef(undefined), + cachedV1PaymentRecovery: testScopedRemovableRef(undefined) } export const { From 3154338fcdfc3761beafe5bb99dab3d635336fe1 Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 01:43:58 +0000 Subject: [PATCH 04/10] test: simplify remote config mock reset Amp-Thread-ID: https://ampcode.com/threads/T-01a0b16b-c4e5-711c-bd0e-e884de3c8631 --- .../remoteConfig/__mocks__/remoteConfig.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/platform/remoteConfig/__mocks__/remoteConfig.ts b/src/platform/remoteConfig/__mocks__/remoteConfig.ts index ddf78429555..c3c92331400 100644 --- a/src/platform/remoteConfig/__mocks__/remoteConfig.ts +++ b/src/platform/remoteConfig/__mocks__/remoteConfig.ts @@ -5,7 +5,6 @@ import type * as realRemoteConfig from '../remoteConfig' function testScopedRef(defaultValue: T) { let value = defaultValue - let restoring = false return customRef((track, trigger) => ({ get() { @@ -15,13 +14,10 @@ function testScopedRef(defaultValue: T) { set(nextValue) { value = nextValue trigger() - if (restoring) return onTestFinished(() => { - restoring = true value = defaultValue trigger() - restoring = false }) } })) @@ -30,20 +26,22 @@ function testScopedRef(defaultValue: T) { function testScopedRemovableRef(defaultValue: T) { const scopedRef = testScopedRef(defaultValue) return Object.assign(scopedRef, { - remove: () => { + remove() { scopedRef.value = defaultValue } }) } -const state = +const remoteConfigStateRef = testScopedRef('unloaded') const remoteConfigModule: typeof realRemoteConfig = { remoteConfig: testScopedRef({}), - remoteConfigState: state, + remoteConfigState: remoteConfigStateRef, remoteConfigErrorStatus: testScopedRef(null), - isAuthenticatedConfigLoaded: computed(() => state.value === 'authenticated'), + isAuthenticatedConfigLoaded: computed( + () => remoteConfigStateRef.value === 'authenticated' + ), configValueOrDefault(remoteConfig, key, defaultValue) { return remoteConfig[key] || defaultValue }, From c541feb51d547eb670f10dbed75e6a616db1f9a7 Mon Sep 17 00:00:00 2001 From: Amp Date: Mon, 21 Sep 2026 06:40:13 +0000 Subject: [PATCH 05/10] test: isolate remote config automock adopter Amp-Thread-ID: https://ampcode.com/threads/T-01a0b16b-c4e5-711c-bd0e-e884de3c8631 --- src/composables/auth/useTurnstile.test.ts | 4 +--- src/composables/billing/useBillingContext.test.ts | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/composables/auth/useTurnstile.test.ts b/src/composables/auth/useTurnstile.test.ts index f4a75b24b37..272228b97ea 100644 --- a/src/composables/auth/useTurnstile.test.ts +++ b/src/composables/auth/useTurnstile.test.ts @@ -6,9 +6,7 @@ import { remoteConfig } from '@/platform/remoteConfig/remoteConfig' import { api } from '@/scripts/api' import { getDevOverride } from '@/utils/devFeatureFlagOverride' -vi.mock(import('@/platform/remoteConfig/remoteConfig'), () => ({ - remoteConfig: { value: {} } -})) +vi.mock(import('@/platform/remoteConfig/remoteConfig')) vi.mock(import('@/scripts/api'), () => ({ api: { getServerFeature: vi.fn() } })) diff --git a/src/composables/billing/useBillingContext.test.ts b/src/composables/billing/useBillingContext.test.ts index 270dc2e2cf4..a73f2992dcb 100644 --- a/src/composables/billing/useBillingContext.test.ts +++ b/src/composables/billing/useBillingContext.test.ts @@ -62,7 +62,6 @@ let mockBillingRail: Ref vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: true })) vi.mock(import('@/platform/cloud/subscription/composables/useSubscription')) -vi.mock(import('@/platform/remoteConfig/remoteConfig')) vi.mock( import('@/platform/cloud/subscription/composables/useSubscriptionDialog'), From a49150746cd34df436abd23945f6bb9cdd9b0ccb Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 05:57:29 +0000 Subject: [PATCH 06/10] test: add third foundation automock batch Amp-Thread-ID: https://ampcode.com/threads/T-01a0b304-43db-71bb-a93d-49b8e3a2d367 --- __mocks__/@datadog/browser-rum.ts | 11 ++ __mocks__/@vueuse/core.ts | 6 + __mocks__/axios.ts | 6 + __mocks__/vue-router.ts | 16 +++ src/__mocks__/i18n.ts | 7 ++ .../maskeditor/dialog/TopBarHeader.test.ts | 2 + .../errors/MissingPackGroupRow.test.ts | 21 ++-- src/components/ui/button/__mocks__/Button.vue | 23 ++++ src/composables/queue/useJobMenu.test.ts | 22 +--- src/composables/useServerLogs.test.ts | 4 +- .../__mocks__/useMediaAssetActions.ts | 24 ++++ src/platform/telemetry/initDatadogRum.test.ts | 99 ++++++++-------- .../useSharedWorkflowUrlLoader.test.ts | 109 ++++++++---------- .../__mocks__/workflowShareService.ts | 30 +++++ .../composables/__mocks__/useManagerState.ts | 17 +++ 15 files changed, 252 insertions(+), 145 deletions(-) create mode 100644 __mocks__/@datadog/browser-rum.ts create mode 100644 __mocks__/@vueuse/core.ts create mode 100644 __mocks__/axios.ts create mode 100644 __mocks__/vue-router.ts create mode 100644 src/__mocks__/i18n.ts create mode 100644 src/components/ui/button/__mocks__/Button.vue create mode 100644 src/platform/assets/composables/__mocks__/useMediaAssetActions.ts create mode 100644 src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts create mode 100644 src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts diff --git a/__mocks__/@datadog/browser-rum.ts b/__mocks__/@datadog/browser-rum.ts new file mode 100644 index 00000000000..f81d1db9845 --- /dev/null +++ b/__mocks__/@datadog/browser-rum.ts @@ -0,0 +1,11 @@ +import { vi } from 'vitest' +import type { datadogRum as realDatadogRum } from '@datadog/browser-rum' + +export const datadogRum: Pick< + typeof realDatadogRum, + 'getInitConfiguration' | 'init' | 'setGlobalContextProperty' +> = { + getInitConfiguration: vi.fn(), + init: vi.fn(), + setGlobalContextProperty: vi.fn() +} diff --git a/__mocks__/@vueuse/core.ts b/__mocks__/@vueuse/core.ts new file mode 100644 index 00000000000..bbcb4a19eed --- /dev/null +++ b/__mocks__/@vueuse/core.ts @@ -0,0 +1,6 @@ +import { vi } from 'vitest' +import type { useEventListener as realUseEventListener } from '@vueuse/core' + +export const useEventListener = vi.fn(() => + vi.fn() +) diff --git a/__mocks__/axios.ts b/__mocks__/axios.ts new file mode 100644 index 00000000000..9d2edf99828 --- /dev/null +++ b/__mocks__/axios.ts @@ -0,0 +1,6 @@ +import { vi } from 'vitest' +import type realAxios from 'axios' + +export default { + get: vi.fn() +} diff --git a/__mocks__/vue-router.ts b/__mocks__/vue-router.ts new file mode 100644 index 00000000000..e419e0fdcfa --- /dev/null +++ b/__mocks__/vue-router.ts @@ -0,0 +1,16 @@ +import { onTestFinished, vi } from 'vitest' +import type { LocationQuery, Router } from 'vue-router' + +const query: LocationQuery = {} +const router: Pick = { + replace: vi.fn(async () => {}) +} + +export const useRoute = vi.fn(() => { + onTestFinished(() => { + for (const key of Object.keys(query)) delete query[key] + }) + return { query } +}) + +export const useRouter = vi.fn(() => router) diff --git a/src/__mocks__/i18n.ts b/src/__mocks__/i18n.ts new file mode 100644 index 00000000000..f28355c8434 --- /dev/null +++ b/src/__mocks__/i18n.ts @@ -0,0 +1,7 @@ +import { vi } from 'vitest' +import type { st as realSt, t as realT } from '@/i18n' + +export const t = vi.fn((key) => String(key)) +export const st = vi.fn( + (key, fallbackMessage) => fallbackMessage || key +) diff --git a/src/components/maskeditor/dialog/TopBarHeader.test.ts b/src/components/maskeditor/dialog/TopBarHeader.test.ts index ee37dac9d89..a6b1bdfb0c0 100644 --- a/src/components/maskeditor/dialog/TopBarHeader.test.ts +++ b/src/components/maskeditor/dialog/TopBarHeader.test.ts @@ -37,6 +37,8 @@ vi.mock(import('@/composables/maskeditor/useMaskEditorSaver'), () => ({ useMaskEditorSaver: () => mockSaver })) +vi.mock(import('@/components/ui/button/Button.vue')) + const i18n = createI18n({ legacy: false, locale: 'en', diff --git a/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts b/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts index e882b7b025d..cb6dd604a8d 100644 --- a/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts +++ b/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts @@ -2,18 +2,18 @@ import userEvent from '@testing-library/user-event' import { render, screen } from '@testing-library/vue' import PrimeVue from 'primevue/config' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { ref } from 'vue' +import { computed, ref } from 'vue' import { createI18n } from 'vue-i18n' import type { MissingPackGroup } from '@/components/rightSidePanel/errors/useErrorGroups' +import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState' import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore' import MissingPackGroupRow from './MissingPackGroupRow.vue' const mockInstallAllPacks = vi.fn() const mockIsInstalling = ref(false) -const mockShouldShowManagerButtons = { value: false } -const mockOpenManager = vi.fn() +const mockShouldShowManagerButtons = ref(false) const mockMissingNodePacks = ref>([]) const mockIsLoading = ref(false) @@ -39,17 +39,7 @@ vi.mock( }) ) -vi.mock( - import('@/workbench/extensions/manager/composables/useManagerState'), - - () => ({ - useManagerState: () => ({ - isNewManagerUI: { value: false }, - shouldShowManagerButtons: mockShouldShowManagerButtons, - openManager: mockOpenManager - }) - }) -) +vi.mock(import('@/workbench/extensions/manager/composables/useManagerState')) vi.mock( import('@/workbench/extensions/manager/types/comfyManagerTypes'), @@ -133,6 +123,9 @@ describe('MissingPackGroupRow', () => { beforeEach(() => { vi.mocked(useComfyManagerStore().isPackInstalled).mockReturnValue(false) mockShouldShowManagerButtons.value = false + useManagerState().shouldShowManagerButtons = computed( + () => mockShouldShowManagerButtons.value + ) mockIsInstalling.value = false mockMissingNodePacks.value = [] mockIsLoading.value = false diff --git a/src/components/ui/button/__mocks__/Button.vue b/src/components/ui/button/__mocks__/Button.vue new file mode 100644 index 00000000000..ba7561f1fb2 --- /dev/null +++ b/src/components/ui/button/__mocks__/Button.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/composables/queue/useJobMenu.test.ts b/src/composables/queue/useJobMenu.test.ts index 2c8d8d048ff..36f7cc90d71 100644 --- a/src/composables/queue/useJobMenu.test.ts +++ b/src/composables/queue/useJobMenu.test.ts @@ -11,6 +11,7 @@ import type { Ref } from 'vue' import type { JobListItem } from '@/composables/queue/useJobList' import type { MenuEntry } from '@/composables/queue/useJobMenu' +import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions' vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: false @@ -35,12 +36,7 @@ vi.mock(import('@/composables/useCopyToClipboard'), () => ({ }) })) -const stMock = vi.fn((_: string, fallback?: string) => fallback ?? _) -const tMock = vi.fn((key: string) => `i18n:${key}`) -vi.mock(import('@/i18n'), () => ({ - st: (...args: Parameters) => stMock(...args), - t: (...args: Parameters) => tMock(...args) -})) +vi.mock(import('@/i18n')) const mapTaskOutputToAssetItemMock = vi.fn() vi.mock(import('@/platform/assets/composables/media/assetMappers'), () => ({ @@ -50,15 +46,7 @@ vi.mock(import('@/platform/assets/composables/media/assetMappers'), () => ({ ) => mapTaskOutputToAssetItemMock(taskItem, output) })) -const mediaAssetActionsMock = { - deleteAssets: vi.fn() -} -vi.mock( - import('@/platform/assets/composables/useMediaAssetActions'), - () => ({ - useMediaAssetActions: () => mediaAssetActionsMock - }) -) +vi.mock(import('@/platform/assets/composables/useMediaAssetActions')) let settingStoreMock: ReturnType @@ -163,7 +151,7 @@ describe('useJobMenu', () => { vi.mocked(queueStoreMock.update).mockResolvedValue(undefined) vi.mocked(queueStoreMock.delete).mockResolvedValue(undefined) cancelJobMock.mockResolvedValue(undefined) - mediaAssetActionsMock.deleteAssets.mockResolvedValue(false) + vi.mocked(useMediaAssetActions().deleteAssets).mockResolvedValue(false) mapTaskOutputToAssetItemMock.mockImplementation((task, output) => ({ task, output @@ -682,7 +670,7 @@ describe('useJobMenu', () => { }) it('does not refresh queue when delete cancelled', async () => { - mediaAssetActionsMock.deleteAssets.mockResolvedValue(false) + vi.mocked(useMediaAssetActions().deleteAssets).mockResolvedValue(false) const { jobMenuEntries } = mountJobMenu() setCurrentItem( createJobItem({ diff --git a/src/composables/useServerLogs.test.ts b/src/composables/useServerLogs.test.ts index 9964291cb8c..ea259f17d90 100644 --- a/src/composables/useServerLogs.test.ts +++ b/src/composables/useServerLogs.test.ts @@ -15,9 +15,7 @@ vi.mock(import('@/scripts/api'), () => ({ } })) -vi.mock(import('@vueuse/core'), () => ({ - useEventListener: vi.fn().mockReturnValue(vi.fn()) -})) +vi.mock(import('@vueuse/core')) describe('useServerLogs', () => { it('should initialize with empty logs array', () => { diff --git a/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts b/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts new file mode 100644 index 00000000000..90c7f9be631 --- /dev/null +++ b/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts @@ -0,0 +1,24 @@ +import { vi } from 'vitest' +import type { useMediaAssetActions as realUseMediaAssetActions } from '../useMediaAssetActions' + +type MediaAssetActions = ReturnType + +const mediaAssetActions: MediaAssetActions = { + downloadAssets: vi.fn(() => {}), + deleteAssets: vi.fn(async () => false), + copyJobId: vi.fn(async () => {}), + addWorkflow: vi.fn(async () => {}), + addMultipleToWorkflow: vi.fn( + async () => {} + ), + openWorkflow: vi.fn(async () => {}), + openMultipleWorkflows: vi.fn( + async () => {} + ), + exportWorkflow: vi.fn(async () => {}), + exportMultipleWorkflows: vi.fn( + async () => {} + ) +} + +export const useMediaAssetActions = vi.fn(() => mediaAssetActions) diff --git a/src/platform/telemetry/initDatadogRum.test.ts b/src/platform/telemetry/initDatadogRum.test.ts index fc5a9bcc155..00370883b7b 100644 --- a/src/platform/telemetry/initDatadogRum.test.ts +++ b/src/platform/telemetry/initDatadogRum.test.ts @@ -1,22 +1,10 @@ +import { datadogRum } from '@datadog/browser-rum' import { beforeEach, describe, expect, it, vi } from 'vitest' -const hoisted = vi.hoisted(() => { - const context: Record = {} +const context: Record = {} +const fetchMock = vi.fn() - return { - context, - fetch: vi.fn(), - getInitConfiguration: vi.fn(), - init: vi.fn(), - setGlobalContextProperty: vi.fn((key: string, value: unknown) => { - context[key] = value - }) - } -}) - -vi.mock(import('@datadog/browser-rum'), () => ({ - datadogRum: hoisted -})) +vi.mock(import('@datadog/browser-rum')) vi.mock(import('./manualRefreshTracker'), () => ({ trackUserManualRefresh: vi.fn() })) @@ -27,15 +15,17 @@ import { trackUserManualRefresh } from './manualRefreshTracker' describe('initDatadogRum', () => { beforeEach(() => { - for (const key of Object.keys(hoisted.context)) { - delete hoisted.context[key] + for (const key of Object.keys(context)) { + delete context[key] } - hoisted.setGlobalContextProperty.mockImplementation((key, value) => { - hoisted.context[key] = value - }) - hoisted.fetch.mockResolvedValue(new Response(null, { status: 503 })) - hoisted.getInitConfiguration.mockReturnValue(undefined) - vi.stubGlobal('fetch', hoisted.fetch) + vi.mocked(datadogRum.setGlobalContextProperty).mockImplementation( + (key, value) => { + context[key] = value + } + ) + fetchMock.mockResolvedValue(new Response(null, { status: 503 })) + vi.mocked(datadogRum.getInitConfiguration).mockReturnValue(undefined) + vi.stubGlobal('fetch', fetchMock) }) it.for([ @@ -48,7 +38,7 @@ describe('initDatadogRum', () => { async ({ hostname, env }) => { await initDatadogRum(hostname) - expect(hoisted.init).toHaveBeenCalledWith({ + expect(datadogRum.init).toHaveBeenCalledWith({ clientToken: 'pub7704486e5b64eb4ff6f62891cda45559', applicationId: '041a9897-5516-4b1f-a245-1a9aa6895488', site: 'us5.datadoghq.com', @@ -71,13 +61,13 @@ describe('initDatadogRum', () => { it('tags canary traffic with its bucket and frontend version', async () => { let resolveProbe: (response: Response) => void - hoisted.fetch.mockReturnValue( + fetchMock.mockReturnValue( new Promise((resolve) => { resolveProbe = resolve }) ) - hoisted.init.mockImplementation(() => { - expect(hoisted.context).toEqual({ + vi.mocked(datadogRum.init).mockImplementation(() => { + expect(context).toEqual({ bucket: 'canary', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -86,7 +76,7 @@ describe('initDatadogRum', () => { const initialization = initDatadogRum('cloud.comfy.org') - expect(hoisted.init).not.toHaveBeenCalled() + expect(datadogRum.init).not.toHaveBeenCalled() resolveProbe!( new Response(null, { headers: { @@ -97,17 +87,17 @@ describe('initDatadogRum', () => { ) await initialization - expect(hoisted.context).toEqual({ + expect(context).toEqual({ bucket: 'canary', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ }) - expect(hoisted.init).toHaveBeenCalledOnce() + expect(datadogRum.init).toHaveBeenCalledOnce() }) it('serializes concurrent initialization', async () => { let resolveProbe: (response: Response) => void - hoisted.fetch.mockReturnValue( + fetchMock.mockReturnValue( new Promise((resolve) => { resolveProbe = resolve }) @@ -126,9 +116,9 @@ describe('initDatadogRum', () => { ) await Promise.all([firstInitialization, secondInitialization]) - expect(hoisted.fetch).toHaveBeenCalledOnce() - expect(hoisted.init).toHaveBeenCalledOnce() - expect(hoisted.context).toEqual({ + expect(fetchMock).toHaveBeenCalledOnce() + expect(datadogRum.init).toHaveBeenCalledOnce() + expect(context).toEqual({ bucket: 'canary', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -136,7 +126,7 @@ describe('initDatadogRum', () => { }) it('defaults the bucket to stable and tracks its frontend version', async () => { - hoisted.fetch.mockResolvedValue( + fetchMock.mockResolvedValue( new Response(null, { headers: { 'X-Frontend-Version': __COMFYUI_FRONTEND_COMMIT__ } }) @@ -144,7 +134,7 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(hoisted.context).toEqual({ + expect(context).toEqual({ bucket: 'stable', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -152,7 +142,7 @@ describe('initDatadogRum', () => { }) it('leaves traffic unclassified when the frontend version is absent', async () => { - hoisted.fetch.mockResolvedValue( + fetchMock.mockResolvedValue( new Response(null, { headers: { 'X-Frontend-Bucket': 'canary' } }) @@ -160,13 +150,13 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(hoisted.context).toEqual({ + expect(context).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) }) it('leaves traffic unclassified when the probe reaches another version', async () => { - hoisted.fetch.mockResolvedValue( + fetchMock.mockResolvedValue( new Response(null, { headers: { 'X-Frontend-Bucket': 'stable', @@ -177,37 +167,37 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(hoisted.context).toEqual({ + expect(context).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) }) it('leaves traffic unclassified when the header probe fails', async () => { - hoisted.fetch.mockResolvedValue(new Response(null, { status: 503 })) + fetchMock.mockResolvedValue(new Response(null, { status: 503 })) await initDatadogRum('cloud.comfy.org') - expect(hoisted.context).toEqual({ + expect(context).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) - expect(hoisted.init).toHaveBeenCalledOnce() + expect(datadogRum.init).toHaveBeenCalledOnce() }) it('initializes RUM when the header probe rejects', async () => { - hoisted.fetch.mockRejectedValue(new Error('network error')) + fetchMock.mockRejectedValue(new Error('network error')) await initDatadogRum('cloud.comfy.org') - expect(hoisted.context).toEqual({ + expect(context).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) - expect(hoisted.init).toHaveBeenCalledOnce() + expect(datadogRum.init).toHaveBeenCalledOnce() }) it('initializes RUM when the header probe times out', async () => { const abortController = new AbortController() vi.spyOn(AbortSignal, 'timeout').mockReturnValue(abortController.signal) - hoisted.fetch.mockImplementation( + fetchMock.mockImplementation( (_input, init) => new Promise((_resolve, reject) => { init?.signal?.addEventListener('abort', () => { @@ -220,10 +210,10 @@ describe('initDatadogRum', () => { abortController.abort() await initialization - expect(hoisted.context).toEqual({ + expect(context).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) - expect(hoisted.init).toHaveBeenCalledOnce() + expect(datadogRum.init).toHaveBeenCalledOnce() }) it.for([ @@ -234,15 +224,18 @@ describe('initDatadogRum', () => { ])('does not initialize on unknown hostname %s', async (hostname) => { await initDatadogRum(hostname) - expect(hoisted.init).not.toHaveBeenCalled() + expect(datadogRum.init).not.toHaveBeenCalled() }) it('does not initialize twice', async () => { - hoisted.getInitConfiguration.mockReturnValue({}) + vi.mocked(datadogRum.getInitConfiguration).mockReturnValue({ + applicationId: 'initialized', + clientToken: 'initialized' + }) await initDatadogRum('cloud.comfy.org') - expect(hoisted.init).not.toHaveBeenCalled() + expect(datadogRum.init).not.toHaveBeenCalled() }) it('tracks manual refreshes only once RUM is initialized', async () => { diff --git a/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts b/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts index b03b64bc3a0..30302b1f228 100644 --- a/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts +++ b/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts @@ -3,9 +3,11 @@ import { fromPartial } from '@total-typescript/shoehorn' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { App } from 'vue' import { computed, createApp, defineComponent } from 'vue' +import { useRoute, useRouter } from 'vue-router' import { useCurrentUser } from '@/composables/auth/useCurrentUser' import { useTelemetry } from '@/platform/telemetry' +import { useWorkflowShareService } from '@/platform/workflow/sharing/services/workflowShareService' import { i18n } from '@/i18n' import { useSharedWorkflowUrlLoader as createSharedWorkflowUrlLoader } from '@/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader' @@ -23,41 +25,13 @@ vi.mock( () => preservedQueryMocks ) -let mockQueryParams: Record = {} -const mockRouterReplace = vi.fn() - -vi.mock(import('vue-router'), () => ({ - useRoute: vi.fn(() => ({ - query: mockQueryParams - })), - useRouter: vi.fn(() => ({ - replace: mockRouterReplace - })) -})) - -const mockImportPublishedAssets = vi.fn() +vi.mock(import('vue-router')) vi.mock(import('@/composables/auth/useCurrentUser')) vi.mock(import('@/platform/telemetry')) -vi.mock( - import('@/platform/workflow/sharing/services/workflowShareService'), - () => ({ - SharedWorkflowLoadError: class extends Error { - readonly isRetryable: boolean - constructor(message: string, isRetryable: boolean) { - super(message) - this.name = 'SharedWorkflowLoadError' - this.isRetryable = isRetryable - } - }, - useWorkflowShareService: () => ({ - getSharedWorkflow: vi.fn(), - importPublishedAssets: mockImportPublishedAssets - }) - }) -) +vi.mock(import('@/platform/workflow/sharing/services/workflowShareService')) const mockLoadGraphData = vi.hoisted(() => vi.fn()) @@ -97,6 +71,12 @@ function useSharedWorkflowUrlLoader() { return result } +function setRouteQuery(query: Record) { + const routeQuery = useRoute().query + for (const key of Object.keys(routeQuery)) delete routeQuery[key] + Object.assign(routeQuery, query) +} + afterEach(() => apps.splice(0).forEach((app) => app.unmount())) const mockShowLayoutDialog = vi.hoisted(() => vi.fn()) @@ -194,7 +174,7 @@ beforeEach(() => { describe('useSharedWorkflowUrlLoader', () => { beforeEach(() => { - mockQueryParams = {} + setRouteQuery({}) mockDialogStack.length = 0 mockShowLayoutDialog.mockImplementation(createDialogInstance) vi.mocked(useDialogStore().updateDialog).mockImplementation( @@ -238,7 +218,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('opens dialog immediately with shareId and loads graph on confirm', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const payload = makePayload() mockShowLayoutDialog.mockImplementation(() => { expect(mockLoadGraphData).not.toHaveBeenCalled() @@ -265,14 +245,14 @@ describe('useSharedWorkflowUrlLoader', () => { is_app_mode: false }) expect(preservedQueryMocks.capturePreservedQuery).not.toHaveBeenCalled() - expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} }) + expect(useRouter().replace).toHaveBeenCalledWith({ query: {} }) expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith( 'share' ) }) it('does not capture share auth attribution for authenticated users', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) useCurrentUser().isLoggedIn = computed(() => true) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithConfirm(makePayload()) @@ -292,7 +272,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('hides template selector when user confirms opening shared workflow', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithConfirm(makePayload()) }) @@ -304,7 +284,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('keeps dialog open with opening state while shared workflow loads', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const graphLoad = createDeferred() mockLoadGraphData.mockReturnValue(graphLoad.promise) @@ -336,7 +316,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('does not load graph when user cancels dialog', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithCancel() }) @@ -346,7 +326,7 @@ describe('useSharedWorkflowUrlLoader', () => { expect(loaded).toBe('cancelled') expect(mockLoadGraphData).not.toHaveBeenCalled() - expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} }) + expect(useRouter().replace).toHaveBeenCalledWith({ query: {} }) expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith( 'share' ) @@ -356,7 +336,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('does not hide template selector when user cancels shared workflow dialog', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithCancel() }) @@ -368,7 +348,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('imports non-owned assets before loading graph when user confirms', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const payload = makePayload({ assets: [ { @@ -390,14 +370,17 @@ describe('useSharedWorkflowUrlLoader', () => { const loaded = await loadSharedWorkflowFromUrl() expect(loaded).toBe('loaded') - expect(mockImportPublishedAssets).toHaveBeenCalledWith(['a1'], 'share-id-1') - expect(mockImportPublishedAssets.mock.invocationCallOrder[0]).toBeLessThan( - mockLoadGraphData.mock.invocationCallOrder[0] - ) + expect( + useWorkflowShareService().importPublishedAssets + ).toHaveBeenCalledWith(['a1'], 'share-id-1') + expect( + vi.mocked(useWorkflowShareService().importPublishedAssets).mock + .invocationCallOrder[0] + ).toBeLessThan(mockLoadGraphData.mock.invocationCallOrder[0]) }) it('does not call import when user chooses open-only', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const payload = makePayload({ assets: [ { @@ -419,11 +402,13 @@ describe('useSharedWorkflowUrlLoader', () => { await loadSharedWorkflowFromUrl() expect(mockLoadGraphData).toHaveBeenCalled() - expect(mockImportPublishedAssets).not.toHaveBeenCalled() + expect( + useWorkflowShareService().importPublishedAssets + ).not.toHaveBeenCalled() }) it('hides template selector when user chooses open-only', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithOpenOnly(makePayload()) }) @@ -435,7 +420,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('shows toast on import failure and returns loaded-without-assets', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const payload = makePayload({ assets: [ { @@ -449,7 +434,9 @@ describe('useSharedWorkflowUrlLoader', () => { } ] }) - mockImportPublishedAssets.mockRejectedValue(new Error('Import failed')) + vi.mocked( + useWorkflowShareService().importPublishedAssets + ).mockRejectedValue(new Error('Import failed')) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithConfirm(payload) }) @@ -474,7 +461,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('clears share intent when graph load fails after importing assets', async () => { - mockQueryParams = { share: 'share-id-1', tab: 'assets' } + setRouteQuery({ share: 'share-id-1', tab: 'assets' }) const payload = makePayload({ assets: [ { @@ -497,15 +484,19 @@ describe('useSharedWorkflowUrlLoader', () => { const loaded = await loadSharedWorkflowFromUrl() expect(loaded).toBe('failed') - expect(mockImportPublishedAssets).toHaveBeenCalledWith(['a1'], 'share-id-1') - expect(mockRouterReplace).toHaveBeenCalledWith({ query: { tab: 'assets' } }) + expect( + useWorkflowShareService().importPublishedAssets + ).toHaveBeenCalledWith(['a1'], 'share-id-1') + expect(useRouter().replace).toHaveBeenCalledWith({ + query: { tab: 'assets' } + }) expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith( 'share' ) }) it('filters out in_library assets before importing', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const payload = makePayload({ assets: [ { @@ -535,7 +526,9 @@ describe('useSharedWorkflowUrlLoader', () => { const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader() await loadSharedWorkflowFromUrl() - expect(mockImportPublishedAssets).toHaveBeenCalledWith(['a1'], 'share-id-1') + expect( + useWorkflowShareService().importPublishedAssets + ).toHaveBeenCalledWith(['a1'], 'share-id-1') }) it('restores preserved share query before loading', async () => { @@ -552,7 +545,7 @@ describe('useSharedWorkflowUrlLoader', () => { expect(preservedQueryMocks.hydratePreservedQuery).toHaveBeenCalledWith( 'share' ) - expect(mockRouterReplace).toHaveBeenCalledWith({ + expect(useRouter().replace).toHaveBeenCalledWith({ query: { share: 'preserved-share-id' } }) const dialogCall = mockShowLayoutDialog.mock.calls[0][0] @@ -560,7 +553,7 @@ describe('useSharedWorkflowUrlLoader', () => { }) it('rejects invalid share parameter values', async () => { - mockQueryParams = { share: '../../../etc/passwd' } + setRouteQuery({ share: '../../../etc/passwd' }) const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader() const loaded = await loadSharedWorkflowFromUrl() @@ -572,14 +565,14 @@ describe('useSharedWorkflowUrlLoader', () => { summary: 'Error', detail: 'Failed to load shared workflow' }) - expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} }) + expect(useRouter().replace).toHaveBeenCalledWith({ query: {} }) expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith( 'share' ) }) it('uses fallback name when payload name is empty', async () => { - mockQueryParams = { share: 'share-id-1' } + setRouteQuery({ share: 'share-id-1' }) const payload = makePayload({ name: '' }) mockShowLayoutDialog.mockImplementation(() => { resolveDialogWithConfirm(payload) diff --git a/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts b/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts new file mode 100644 index 00000000000..ab022a89393 --- /dev/null +++ b/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts @@ -0,0 +1,30 @@ +import { vi } from 'vitest' +import type { useWorkflowShareService as realUseWorkflowShareService } from '../workflowShareService' + +type WorkflowShareService = ReturnType + +const workflowShareService: WorkflowShareService = { + publishWorkflow: vi.fn(() => + Promise.reject(new Error('publishWorkflow is not configured')) + ), + getPublishStatus: vi.fn( + async () => ({ + isPublished: false, + shareId: null, + shareUrl: null, + publishedAt: null, + prefill: null + }) + ), + getShareableAssets: vi.fn( + async () => [] + ), + getSharedWorkflow: vi.fn(() => + Promise.reject(new Error('getSharedWorkflow is not configured')) + ), + importPublishedAssets: vi.fn( + async () => {} + ) +} + +export const useWorkflowShareService = vi.fn(() => workflowShareService) diff --git a/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts b/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts new file mode 100644 index 00000000000..617ea323d31 --- /dev/null +++ b/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts @@ -0,0 +1,17 @@ +import { computed } from 'vue' +import { vi } from 'vitest' +import type { useManagerState as realUseManagerState } from '../useManagerState' + +type ManagerState = ReturnType +type ManagerStateMock = Pick< + ManagerState, + 'isNewManagerUI' | 'shouldShowManagerButtons' | 'openManager' +> + +const managerState: ManagerStateMock = { + isNewManagerUI: computed(() => false), + shouldShowManagerButtons: computed(() => false), + openManager: vi.fn(async () => {}) +} + +export const useManagerState = vi.fn(() => managerState) From 24459d66d93e65b9f8b8da0506e9e13df5c01bc9 Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 06:20:27 +0000 Subject: [PATCH 07/10] test: refine foundation automock contracts Amp-Thread-ID: https://ampcode.com/threads/T-01a0b304-43db-71bb-a93d-49b8e3a2d367 --- __mocks__/@datadog/browser-rum.ts | 38 ++++++++++++++----- __mocks__/axios.ts | 6 ++- __mocks__/vue-router.ts | 24 ++++++++---- .../maskeditor/dialog/TopBarHeader.test.ts | 2 - src/components/ui/button/__mocks__/Button.vue | 23 ----------- .../__mocks__/useMediaAssetActions.ts | 31 +++++++-------- src/platform/telemetry/initDatadogRum.test.ts | 27 +++++-------- .../__mocks__/workflowShareService.ts | 31 +++++++-------- .../composables/__mocks__/useManagerState.ts | 2 +- 9 files changed, 85 insertions(+), 99 deletions(-) delete mode 100644 src/components/ui/button/__mocks__/Button.vue diff --git a/__mocks__/@datadog/browser-rum.ts b/__mocks__/@datadog/browser-rum.ts index f81d1db9845..0a56c2fa705 100644 --- a/__mocks__/@datadog/browser-rum.ts +++ b/__mocks__/@datadog/browser-rum.ts @@ -1,11 +1,29 @@ -import { vi } from 'vitest' -import type { datadogRum as realDatadogRum } from '@datadog/browser-rum' +import { onTestFinished, vi } from 'vitest' +import type { DatadogRum as RealDatadogRum } from '@datadog/browser-rum' -export const datadogRum: Pick< - typeof realDatadogRum, - 'getInitConfiguration' | 'init' | 'setGlobalContextProperty' -> = { - getInitConfiguration: vi.fn(), - init: vi.fn(), - setGlobalContextProperty: vi.fn() -} +type DatadogRum = Pick< + RealDatadogRum, + | 'getGlobalContext' + | 'getInitConfiguration' + | 'init' + | 'setGlobalContextProperty' +> + +const context: ReturnType = {} + +export const datadogRum = vi.mockObject( + { + getGlobalContext: () => { + onTestFinished(() => { + for (const key of Object.keys(context)) delete context[key] + }) + return context + }, + getInitConfiguration: () => undefined, + init: () => {}, + setGlobalContextProperty: (key, value) => { + context[key] = value + } + }, + { spy: true } +) diff --git a/__mocks__/axios.ts b/__mocks__/axios.ts index 9d2edf99828..b44870f378a 100644 --- a/__mocks__/axios.ts +++ b/__mocks__/axios.ts @@ -1,6 +1,8 @@ import { vi } from 'vitest' import type realAxios from 'axios' -export default { - get: vi.fn() +const axios: Pick = { + get: vi.fn() } + +export default axios diff --git a/__mocks__/vue-router.ts b/__mocks__/vue-router.ts index e419e0fdcfa..fb088dca78b 100644 --- a/__mocks__/vue-router.ts +++ b/__mocks__/vue-router.ts @@ -1,16 +1,24 @@ import { onTestFinished, vi } from 'vitest' import type { LocationQuery, Router } from 'vue-router' +type VueRouterMock = { + useRoute: () => { query: LocationQuery } + useRouter: () => Pick +} + const query: LocationQuery = {} const router: Pick = { - replace: vi.fn(async () => {}) + replace: vi.fn(async () => {}) } -export const useRoute = vi.fn(() => { - onTestFinished(() => { - for (const key of Object.keys(query)) delete query[key] - }) - return { query } -}) +const vueRouter: VueRouterMock = { + useRoute: vi.fn(() => { + onTestFinished(() => { + for (const key of Object.keys(query)) delete query[key] + }) + return { query } + }), + useRouter: vi.fn(() => router) +} -export const useRouter = vi.fn(() => router) +export const { useRoute, useRouter } = vueRouter diff --git a/src/components/maskeditor/dialog/TopBarHeader.test.ts b/src/components/maskeditor/dialog/TopBarHeader.test.ts index a6b1bdfb0c0..ee37dac9d89 100644 --- a/src/components/maskeditor/dialog/TopBarHeader.test.ts +++ b/src/components/maskeditor/dialog/TopBarHeader.test.ts @@ -37,8 +37,6 @@ vi.mock(import('@/composables/maskeditor/useMaskEditorSaver'), () => ({ useMaskEditorSaver: () => mockSaver })) -vi.mock(import('@/components/ui/button/Button.vue')) - const i18n = createI18n({ legacy: false, locale: 'en', diff --git a/src/components/ui/button/__mocks__/Button.vue b/src/components/ui/button/__mocks__/Button.vue deleted file mode 100644 index ba7561f1fb2..00000000000 --- a/src/components/ui/button/__mocks__/Button.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - diff --git a/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts b/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts index 90c7f9be631..1bb64fd214c 100644 --- a/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts +++ b/src/platform/assets/composables/__mocks__/useMediaAssetActions.ts @@ -3,22 +3,19 @@ import type { useMediaAssetActions as realUseMediaAssetActions } from '../useMed type MediaAssetActions = ReturnType -const mediaAssetActions: MediaAssetActions = { - downloadAssets: vi.fn(() => {}), - deleteAssets: vi.fn(async () => false), - copyJobId: vi.fn(async () => {}), - addWorkflow: vi.fn(async () => {}), - addMultipleToWorkflow: vi.fn( - async () => {} - ), - openWorkflow: vi.fn(async () => {}), - openMultipleWorkflows: vi.fn( - async () => {} - ), - exportWorkflow: vi.fn(async () => {}), - exportMultipleWorkflows: vi.fn( - async () => {} - ) -} +const mediaAssetActions = vi.mockObject( + { + downloadAssets: () => {}, + deleteAssets: async () => false, + copyJobId: async () => {}, + addWorkflow: async () => {}, + addMultipleToWorkflow: async () => {}, + openWorkflow: async () => {}, + openMultipleWorkflows: async () => {}, + exportWorkflow: async () => {}, + exportMultipleWorkflows: async () => {} + }, + { spy: true } +) export const useMediaAssetActions = vi.fn(() => mediaAssetActions) diff --git a/src/platform/telemetry/initDatadogRum.test.ts b/src/platform/telemetry/initDatadogRum.test.ts index 00370883b7b..e0254ceee45 100644 --- a/src/platform/telemetry/initDatadogRum.test.ts +++ b/src/platform/telemetry/initDatadogRum.test.ts @@ -1,7 +1,6 @@ import { datadogRum } from '@datadog/browser-rum' import { beforeEach, describe, expect, it, vi } from 'vitest' -const context: Record = {} const fetchMock = vi.fn() vi.mock(import('@datadog/browser-rum')) @@ -15,14 +14,6 @@ import { trackUserManualRefresh } from './manualRefreshTracker' describe('initDatadogRum', () => { beforeEach(() => { - for (const key of Object.keys(context)) { - delete context[key] - } - vi.mocked(datadogRum.setGlobalContextProperty).mockImplementation( - (key, value) => { - context[key] = value - } - ) fetchMock.mockResolvedValue(new Response(null, { status: 503 })) vi.mocked(datadogRum.getInitConfiguration).mockReturnValue(undefined) vi.stubGlobal('fetch', fetchMock) @@ -67,7 +58,7 @@ describe('initDatadogRum', () => { }) ) vi.mocked(datadogRum.init).mockImplementation(() => { - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ bucket: 'canary', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -87,7 +78,7 @@ describe('initDatadogRum', () => { ) await initialization - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ bucket: 'canary', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -118,7 +109,7 @@ describe('initDatadogRum', () => { expect(fetchMock).toHaveBeenCalledOnce() expect(datadogRum.init).toHaveBeenCalledOnce() - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ bucket: 'canary', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -134,7 +125,7 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ bucket: 'stable', comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__, version: __COMFYUI_FRONTEND_COMMIT__ @@ -150,7 +141,7 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) }) @@ -167,7 +158,7 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) }) @@ -177,7 +168,7 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) expect(datadogRum.init).toHaveBeenCalledOnce() @@ -188,7 +179,7 @@ describe('initDatadogRum', () => { await initDatadogRum('cloud.comfy.org') - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) expect(datadogRum.init).toHaveBeenCalledOnce() @@ -210,7 +201,7 @@ describe('initDatadogRum', () => { abortController.abort() await initialization - expect(context).toEqual({ + expect(datadogRum.getGlobalContext()).toEqual({ comfyui_frontend_version: __COMFYUI_FRONTEND_VERSION__ }) expect(datadogRum.init).toHaveBeenCalledOnce() diff --git a/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts b/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts index ab022a89393..fe201e7989e 100644 --- a/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts +++ b/src/platform/workflow/sharing/services/__mocks__/workflowShareService.ts @@ -3,28 +3,23 @@ import type { useWorkflowShareService as realUseWorkflowShareService } from '../ type WorkflowShareService = ReturnType -const workflowShareService: WorkflowShareService = { - publishWorkflow: vi.fn(() => - Promise.reject(new Error('publishWorkflow is not configured')) - ), - getPublishStatus: vi.fn( - async () => ({ +const workflowShareService = vi.mockObject( + { + publishWorkflow: () => + Promise.reject(new Error('publishWorkflow is not configured')), + getPublishStatus: async () => ({ isPublished: false, shareId: null, shareUrl: null, publishedAt: null, prefill: null - }) - ), - getShareableAssets: vi.fn( - async () => [] - ), - getSharedWorkflow: vi.fn(() => - Promise.reject(new Error('getSharedWorkflow is not configured')) - ), - importPublishedAssets: vi.fn( - async () => {} - ) -} + }), + getShareableAssets: async () => [], + getSharedWorkflow: () => + Promise.reject(new Error('getSharedWorkflow is not configured')), + importPublishedAssets: async () => {} + }, + { spy: true } +) export const useWorkflowShareService = vi.fn(() => workflowShareService) diff --git a/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts b/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts index 617ea323d31..f462955e493 100644 --- a/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts +++ b/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts @@ -11,7 +11,7 @@ type ManagerStateMock = Pick< const managerState: ManagerStateMock = { isNewManagerUI: computed(() => false), shouldShowManagerButtons: computed(() => false), - openManager: vi.fn(async () => {}) + openManager: vi.fn(async () => {}) } export const useManagerState = vi.fn(() => managerState) From 56dba85dd4bf3e97246e8e20ce43ac1a6f80e72d Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 15:43:04 +0000 Subject: [PATCH 08/10] test: clean Datadog context after writes Amp-Thread-ID: https://ampcode.com/threads/T-01a0b304-43db-71bb-a93d-49b8e3a2d367 --- __mocks__/@datadog/browser-rum.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/__mocks__/@datadog/browser-rum.ts b/__mocks__/@datadog/browser-rum.ts index 0a56c2fa705..4558b221716 100644 --- a/__mocks__/@datadog/browser-rum.ts +++ b/__mocks__/@datadog/browser-rum.ts @@ -13,15 +13,13 @@ const context: ReturnType = {} export const datadogRum = vi.mockObject( { - getGlobalContext: () => { - onTestFinished(() => { - for (const key of Object.keys(context)) delete context[key] - }) - return context - }, + getGlobalContext: () => context, getInitConfiguration: () => undefined, init: () => {}, setGlobalContextProperty: (key, value) => { + onTestFinished(() => { + for (const key of Object.keys(context)) delete context[key] + }) context[key] = value } }, From 631a97ec5c8a9654dd9bfc06254c38a7709dce6d Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 18 Sep 2026 18:03:10 +0000 Subject: [PATCH 09/10] test: deduplicate Datadog context cleanup Amp-Thread-ID: https://ampcode.com/threads/T-01a0b304-43db-71bb-a93d-49b8e3a2d367 --- __mocks__/@datadog/browser-rum.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/__mocks__/@datadog/browser-rum.ts b/__mocks__/@datadog/browser-rum.ts index 4558b221716..5f730a08b9e 100644 --- a/__mocks__/@datadog/browser-rum.ts +++ b/__mocks__/@datadog/browser-rum.ts @@ -10,6 +10,7 @@ type DatadogRum = Pick< > const context: ReturnType = {} +let contextCleanupRegistered = false export const datadogRum = vi.mockObject( { @@ -17,9 +18,13 @@ export const datadogRum = vi.mockObject( getInitConfiguration: () => undefined, init: () => {}, setGlobalContextProperty: (key, value) => { - onTestFinished(() => { - for (const key of Object.keys(context)) delete context[key] - }) + if (!contextCleanupRegistered) { + onTestFinished(() => { + for (const key of Object.keys(context)) delete context[key] + contextCleanupRegistered = false + }) + contextCleanupRegistered = true + } context[key] = value } }, From 137fd1ccde54cf37a07770b76330c9af242f7936 Mon Sep 17 00:00:00 2001 From: Amp Date: Tue, 22 Sep 2026 02:13:46 +0000 Subject: [PATCH 10/10] test: restore manager mock state after each test Amp-Thread-ID: https://ampcode.com/threads/T-01a0b304-43db-71bb-a93d-49b8e3a2d367 --- .../composables/__mocks__/useManagerState.ts | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts b/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts index f462955e493..de7c32bdcd9 100644 --- a/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts +++ b/src/workbench/extensions/manager/composables/__mocks__/useManagerState.ts @@ -1,5 +1,5 @@ import { computed } from 'vue' -import { vi } from 'vitest' +import { onTestFinished, vi } from 'vitest' import type { useManagerState as realUseManagerState } from '../useManagerState' type ManagerState = ReturnType @@ -8,10 +8,28 @@ type ManagerStateMock = Pick< 'isNewManagerUI' | 'shouldShowManagerButtons' | 'openManager' > -const managerState: ManagerStateMock = { - isNewManagerUI: computed(() => false), - shouldShowManagerButtons: computed(() => false), +const actionDefaults: Pick = { openManager: vi.fn(async () => {}) } -export const useManagerState = vi.fn(() => managerState) +function createDefaultManagerState(): ManagerStateMock { + return { + isNewManagerUI: computed(() => false), + shouldShowManagerButtons: computed(() => false), + ...actionDefaults + } +} + +const managerState = createDefaultManagerState() +let cleanupRegistered = false + +export const useManagerState = vi.fn(() => { + if (!cleanupRegistered) { + onTestFinished(() => { + Object.assign(managerState, createDefaultManagerState()) + cleanupRegistered = false + }) + cleanupRegistered = true + } + return managerState +})