From 6b1903956eda4d147eb1b3694c3dd9c8db64e47b Mon Sep 17 00:00:00 2001 From: christian-byrne Date: Sat, 29 Aug 2026 10:08:27 -0700 Subject: [PATCH 1/7] test: cover partial asset graph cleanup --- .../composables/useMediaAssetActions.test.ts | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index fabfff6b7b3..8c81f211205 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -1505,6 +1505,61 @@ describe('useMediaAssetActions', () => { mockAppGraph.value = { _nodes: [] } }) + it('cleans every shared reference only for successful assets after a partial deletion', async () => { + vi.spyOn(console, 'warn').mockImplementation(() => {}) + mockDeleteAsset.mockImplementation(async (id: string) => { + if (id === 'asset-failed') throw new Error('503 Service Unavailable') + }) + const successfulCallbacks = [vi.fn(), vi.fn()] + const successfulNodes = successfulCallbacks.map((callback, index) => + fromAny({ + id: index + 10, + widgets: [{ name: 'image', value: 'shared.png', callback }], + imgs: [{ src: `blob:shared-preview-${index}` }], + graph: { setDirtyCanvas: vi.fn() } + }) + ) + const failedCallback = vi.fn() + const failedNode = fromAny({ + id: 12, + widgets: [ + { name: 'image', value: 'failed.png', callback: failedCallback } + ], + imgs: [{ src: 'blob:failed-preview' }], + graph: { setDirtyCanvas: vi.fn() } + }) + mockAppGraph.value = { + _nodes: [...successfulNodes, failedNode], + nodes: [...successfulNodes, failedNode] + } + const actions = useMediaAssetActions() + + await actions.deleteAssets([ + createMockAsset({ id: 'asset-success', name: 'shared.png' }), + createMockAsset({ id: 'asset-failed', name: 'failed.png' }) + ]) + + expect(mockMarkMissingMedia).toHaveBeenCalledWith( + mockAppGraph.value, + new Set(['shared.png', 'shared.png [input]']) + ) + for (const [index, node] of successfulNodes.entries()) { + expect(mockRemoveNodeOutputsForNode).toHaveBeenCalledWith(node) + expect(node.imgs).toBeUndefined() + expect(node.widgets?.[0].value).toBe('') + expect(successfulCallbacks[index]).toHaveBeenCalledWith('') + expect(node.graph?.setDirtyCanvas).toHaveBeenCalledWith(true) + } + expect(mockRemoveNodeOutputsForNode).not.toHaveBeenCalledWith(failedNode) + expect(failedNode.imgs).toEqual([{ src: 'blob:failed-preview' }]) + expect(failedNode.widgets?.[0].value).toBe('failed.png') + expect(failedCallback).not.toHaveBeenCalled() + expect(mockCaptureCanvasState).toHaveBeenCalledTimes(1) + expect(mockCaptureCanvasState).toHaveBeenCalledAfter( + mockClearWidgetValues + ) + }) + it('invokes clearNodePreviewCacheForValues with canonical widget-value variants', async () => { mockDeleteAsset.mockResolvedValue(undefined) const actions = useMediaAssetActions() From d69d1038ca2d92ad25c8207872f56eecffbdc1a2 Mon Sep 17 00:00:00 2001 From: bymyself Date: Tue, 1 Sep 2026 07:59:54 +0000 Subject: [PATCH 2/7] test: preserve asset cleanup integration coverage --- .../composables/useMediaAssetActions.test.ts | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index 8c81f211205..cd829cbdfd3 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -19,6 +19,8 @@ import { MediaAssetKey } from '@/platform/assets/schemas/mediaAssetSchema' import type { AssetId, AssetItem } from '@/platform/assets/schemas/assetSchema' import type { AssetMeta } from '@/platform/assets/schemas/mediaAssetSchema' import { api } from '@/scripts/api' +import { clearDeletedAssetWidgetValues } from '../utils/clearDeletedAssetWidgetValues' +import { clearNodePreviewCacheForValues } from '../utils/clearNodePreviewCacheForValues' import { resolveOutputAssetItems } from '../utils/outputAssetUtil' import { useMediaAssetActions as createMediaAssetActions } from './useMediaAssetActions' @@ -156,7 +158,9 @@ vi.mock(import('@/scripts/api'), () => ({ } })) -const mockAppGraph = vi.hoisted(() => ({ value: { _nodes: [] as unknown[] } })) +const mockAppGraph = vi.hoisted(() => ({ + value: { _nodes: [] as unknown[], nodes: [] as unknown[] } +})) vi.mock(import('@/scripts/app'), () => ({ app: { nodeOutputs: {}, @@ -175,16 +179,11 @@ const mockRemoveNodeOutputsForNode = vi.hoisted(() => vi.fn()) const mockCaptureCanvasState = vi.hoisted(() => vi.fn()) -const mockClearNodePreviewCache = vi.hoisted(() => vi.fn()) -vi.mock(import('../utils/clearNodePreviewCacheForValues'), () => ({ - clearNodePreviewCacheForValues: mockClearNodePreviewCache, - findNodesReferencingValues: vi.fn(() => []) -})) +vi.mock(import('../utils/clearNodePreviewCacheForValues'), { spy: true }) +const mockClearNodePreviewCache = vi.mocked(clearNodePreviewCacheForValues) -const mockClearWidgetValues = vi.hoisted(() => vi.fn()) -vi.mock(import('../utils/clearDeletedAssetWidgetValues'), () => ({ - clearDeletedAssetWidgetValues: mockClearWidgetValues -})) +vi.mock(import('../utils/clearDeletedAssetWidgetValues'), { spy: true }) +const mockClearWidgetValues = vi.mocked(clearDeletedAssetWidgetValues) const mockMarkMissingMedia = vi.hoisted(() => vi.fn()) vi.mock(import('../utils/markDeletedAssetsAsMissingMedia'), () => ({ @@ -1314,7 +1313,7 @@ describe('useMediaAssetActions', () => { props.onConfirm(true) } ) - mockAppGraph.value = { _nodes: [] } + mockAppGraph.value = { _nodes: [], nodes: [] } }) it('completes the lifecycle for one confirmed asset record', async () => { @@ -1502,7 +1501,7 @@ describe('useMediaAssetActions', () => { opts.props.onConfirm(true) } ) - mockAppGraph.value = { _nodes: [] } + mockAppGraph.value = { _nodes: [], nodes: [] } }) it('cleans every shared reference only for successful assets after a partial deletion', async () => { @@ -1583,7 +1582,7 @@ describe('useMediaAssetActions', () => { ) expect(typeof removeArg).toBe('function') - const sampleNode = { id: 42 } + const sampleNode = fromAny({ id: 42 }) removeArg(sampleNode) expect(mockRemoveNodeOutputsForNode).toHaveBeenCalledWith(sampleNode) // Locator is resolved from the node's own graph, not from the raw id — @@ -1692,7 +1691,7 @@ describe('useMediaAssetActions', () => { ({ props }: { props: { onConfirm: (confirmed: boolean) => void } }) => props.onConfirm(true) ) - mockAppGraph.value = { _nodes: [] } + mockAppGraph.value = { _nodes: [], nodes: [] } }) it('keeps a failed asset listed and removes it once a retry succeeds', async () => { From 5b364baee1cb5965bcc08152f70e1bd01b2aa133 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 21 Sep 2026 01:23:53 -0700 Subject: [PATCH 3/7] test(assets): verify partial missing-media state --- .../composables/useMediaAssetActions.test.ts | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index cd829cbdfd3..0693a90b6c0 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -18,9 +18,12 @@ import type { IWidget } from '@/lib/litegraph/src/types/widgets' import { MediaAssetKey } from '@/platform/assets/schemas/mediaAssetSchema' import type { AssetId, AssetItem } from '@/platform/assets/schemas/assetSchema' import type { AssetMeta } from '@/platform/assets/schemas/mediaAssetSchema' +import { scanNodeMediaCandidates } from '@/platform/missingMedia/missingMediaScan' +import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore' import { api } from '@/scripts/api' import { clearDeletedAssetWidgetValues } from '../utils/clearDeletedAssetWidgetValues' import { clearNodePreviewCacheForValues } from '../utils/clearNodePreviewCacheForValues' +import { markDeletedAssetsAsMissingMedia } from '../utils/markDeletedAssetsAsMissingMedia' import { resolveOutputAssetItems } from '../utils/outputAssetUtil' import { useMediaAssetActions as createMediaAssetActions } from './useMediaAssetActions' @@ -185,10 +188,11 @@ const mockClearNodePreviewCache = vi.mocked(clearNodePreviewCacheForValues) vi.mock(import('../utils/clearDeletedAssetWidgetValues'), { spy: true }) const mockClearWidgetValues = vi.mocked(clearDeletedAssetWidgetValues) -const mockMarkMissingMedia = vi.hoisted(() => vi.fn()) -vi.mock(import('../utils/markDeletedAssetsAsMissingMedia'), () => ({ - markDeletedAssetsAsMissingMedia: mockMarkMissingMedia -})) +vi.mock(import('@/platform/missingMedia/missingMediaScan'), { spy: true }) +const mockScanNodeMediaCandidates = vi.mocked(scanNodeMediaCandidates) + +vi.mock(import('../utils/markDeletedAssetsAsMissingMedia'), { spy: true }) +const mockMarkMissingMedia = vi.mocked(markDeletedAssetsAsMissingMedia) function createMockAsset(overrides: Partial = {}): AssetItem { return fromPartial({ @@ -1531,6 +1535,16 @@ describe('useMediaAssetActions', () => { _nodes: [...successfulNodes, failedNode], nodes: [...successfulNodes, failedNode] } + mockScanNodeMediaCandidates.mockImplementation((_graph, node) => [ + { + nodeId: String(node.id), + nodeType: 'LoadImage', + widgetName: 'image', + mediaType: 'image', + name: String(node.widgets?.[0].value), + isMissing: undefined + } + ]) const actions = useMediaAssetActions() await actions.deleteAssets([ @@ -1542,6 +1556,19 @@ describe('useMediaAssetActions', () => { mockAppGraph.value, new Set(['shared.png', 'shared.png [input]']) ) + expect(useMissingMediaStore().missingMediaCandidates).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + name: 'shared.png', + isMissing: true + }) + ]) + ) + expect(useMissingMediaStore().missingMediaCandidates).not.toEqual( + expect.arrayContaining([ + expect.objectContaining({ name: 'failed.png' }) + ]) + ) for (const [index, node] of successfulNodes.entries()) { expect(mockRemoveNodeOutputsForNode).toHaveBeenCalledWith(node) expect(node.imgs).toBeUndefined() From fe1367239e2a324d133a969e5976b96d9ae976bf Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 21 Sep 2026 02:32:12 -0700 Subject: [PATCH 4/7] test(assets): keep deletion warnings observable Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/16248#discussion_r3963680850 --- src/platform/assets/composables/useMediaAssetActions.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index 0693a90b6c0..cddacfa9272 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -1509,7 +1509,6 @@ describe('useMediaAssetActions', () => { }) it('cleans every shared reference only for successful assets after a partial deletion', async () => { - vi.spyOn(console, 'warn').mockImplementation(() => {}) mockDeleteAsset.mockImplementation(async (id: string) => { if (id === 'asset-failed') throw new Error('503 Service Unavailable') }) From a6b157e318712ac5a7c7a25e6049660b951f6c2a Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 21 Sep 2026 02:32:22 -0700 Subject: [PATCH 5/7] test(assets): remove unused graph fixture field Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/16248#discussion_r3963680863 --- .../assets/composables/useMediaAssetActions.test.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index cddacfa9272..85d907b0df0 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -162,7 +162,7 @@ vi.mock(import('@/scripts/api'), () => ({ })) const mockAppGraph = vi.hoisted(() => ({ - value: { _nodes: [] as unknown[], nodes: [] as unknown[] } + value: { nodes: [] as unknown[] } })) vi.mock(import('@/scripts/app'), () => ({ app: { @@ -1317,7 +1317,7 @@ describe('useMediaAssetActions', () => { props.onConfirm(true) } ) - mockAppGraph.value = { _nodes: [], nodes: [] } + mockAppGraph.value = { nodes: [] } }) it('completes the lifecycle for one confirmed asset record', async () => { @@ -1531,7 +1531,6 @@ describe('useMediaAssetActions', () => { graph: { setDirtyCanvas: vi.fn() } }) mockAppGraph.value = { - _nodes: [...successfulNodes, failedNode], nodes: [...successfulNodes, failedNode] } mockScanNodeMediaCandidates.mockImplementation((_graph, node) => [ @@ -1717,7 +1716,7 @@ describe('useMediaAssetActions', () => { ({ props }: { props: { onConfirm: (confirmed: boolean) => void } }) => props.onConfirm(true) ) - mockAppGraph.value = { _nodes: [], nodes: [] } + mockAppGraph.value = { nodes: [] } }) it('keeps a failed asset listed and removes it once a retry succeeds', async () => { From 7f870b54677e4cf6c3f08496a7649255ba3488bc Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 21 Sep 2026 02:32:45 -0700 Subject: [PATCH 6/7] test(assets): cover mixed deletion widgets Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/16248#discussion_r3963680867 --- .../composables/useMediaAssetActions.test.ts | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index 85d907b0df0..7808485a17b 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -1513,25 +1513,28 @@ describe('useMediaAssetActions', () => { if (id === 'asset-failed') throw new Error('503 Service Unavailable') }) const successfulCallbacks = [vi.fn(), vi.fn()] + const failedCallback = vi.fn() const successfulNodes = successfulCallbacks.map((callback, index) => fromAny({ id: index + 10, - widgets: [{ name: 'image', value: 'shared.png', callback }], + widgets: [ + { name: 'image', value: 'shared.png', callback }, + ...(index === 0 + ? [ + { + name: 'mask', + value: 'failed.png', + callback: failedCallback + } + ] + : []) + ], imgs: [{ src: `blob:shared-preview-${index}` }], graph: { setDirtyCanvas: vi.fn() } }) ) - const failedCallback = vi.fn() - const failedNode = fromAny({ - id: 12, - widgets: [ - { name: 'image', value: 'failed.png', callback: failedCallback } - ], - imgs: [{ src: 'blob:failed-preview' }], - graph: { setDirtyCanvas: vi.fn() } - }) mockAppGraph.value = { - nodes: [...successfulNodes, failedNode] + nodes: successfulNodes } mockScanNodeMediaCandidates.mockImplementation((_graph, node) => [ { @@ -1574,9 +1577,7 @@ describe('useMediaAssetActions', () => { expect(successfulCallbacks[index]).toHaveBeenCalledWith('') expect(node.graph?.setDirtyCanvas).toHaveBeenCalledWith(true) } - expect(mockRemoveNodeOutputsForNode).not.toHaveBeenCalledWith(failedNode) - expect(failedNode.imgs).toEqual([{ src: 'blob:failed-preview' }]) - expect(failedNode.widgets?.[0].value).toBe('failed.png') + expect(successfulNodes[0].widgets?.[1].value).toBe('failed.png') expect(failedCallback).not.toHaveBeenCalled() expect(mockCaptureCanvasState).toHaveBeenCalledTimes(1) expect(mockCaptureCanvasState).toHaveBeenCalledAfter( From 5deca7bafc628f32222c6301017eea7a7c467ade Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 21 Sep 2026 02:36:45 -0700 Subject: [PATCH 7/7] test(assets): finish graph fixture cleanup Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/16248#discussion_r3963680863 --- src/platform/assets/composables/useMediaAssetActions.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index 7808485a17b..ee47935e0d5 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -1505,7 +1505,7 @@ describe('useMediaAssetActions', () => { opts.props.onConfirm(true) } ) - mockAppGraph.value = { _nodes: [], nodes: [] } + mockAppGraph.value = { nodes: [] } }) it('cleans every shared reference only for successful assets after a partial deletion', async () => {