diff --git a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts index 88fc034fb52..a8766cef1c7 100644 --- a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts @@ -181,6 +181,46 @@ test.describe('Vue Nodes Image Preview', { tag: '@vue-nodes' }, () => { await expect(subgraphNode.imagePreview.locator('img')).toHaveCount(1) } ) + + // Regression test for incident-94: a mid-execution sampler preview inside a + // subgraph must promote to the outer, non-entered SubgraphNode. + wstest( + 'Promotes a live sampler preview from inside a subgraph to the outer SubgraphNode', + async ({ comfyPage, getWebSocket }) => { + const execution = new ExecutionHelper(comfyPage, await getWebSocket()) + const samplerNode = new VueNodeFixture( + comfyPage.vueNodes.getNodeByTitle('KSampler') + ) + const subgraphNode = new VueNodeFixture( + comfyPage.vueNodes.getNodeByTitle('New Subgraph') + ) + + await test.step('Add node', async () => { + await comfyPage.menu.topbar.newWorkflowButton.click() + await comfyPage.nextFrame() + + await comfyPage.searchBoxV2.addNode('KSampler') + await expect(samplerNode.root).toBeVisible() + }) + + await test.step('Create subgraph', async () => { + await samplerNode.title.click() + await comfyPage.page.keyboard.press('Control+Shift+e') + await expect(subgraphNode.root).toBeVisible() + }) + + await test.step('Fire live preview for the nested sampler', async () => { + const jobId = await execution.run() + execution.executionStart(jobId) + execution.executing(jobId, '2:1') + execution.latentPreview(jobId, '2:1') + }) + + await expect( + subgraphNode.root.getByAltText('Live sampling preview') + ).toBeVisible() + } + ) }) async function countColumns(locator: Locator) { diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts index dab285c4d62..253d3656e44 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts @@ -4,6 +4,7 @@ import { setActivePinia } from 'pinia' import { beforeEach, describe, expect, it, vi } from 'vitest' import { toNodeId } from '@/types/nodeId' +import { createNodeLocatorId } from '@/types/nodeIdentification' import { computed } from 'vue' import type { ComponentProps } from 'vue-component-type-helpers' import { createI18n } from 'vue-i18n' @@ -12,6 +13,7 @@ import type { VueNodeData } from '@/composables/graph/useGraphNodeManager' import { TitleMode } from '@/lib/litegraph/src/types/globalEnums' import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue' import { useVueElementTracking } from '@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking' +import { useNodePreviewState } from '@/renderer/extensions/vueNodes/preview/useNodePreviewState' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useSettingStore } from '@/platform/settings/settingStore' import { app } from '@/scripts/app' @@ -388,4 +390,21 @@ describe('LGraphNode', () => { expect(app.dragOverNode).toBe(mockData.mockLgraphNode) }) }) + + describe('Subgraph live preview promotion (incident-94 regression)', () => { + it('renders the live preview image on a subgraph node with a populated preview', () => { + mockData.mockLgraphNode = { isSubgraphNode: () => true } + vi.mocked(useNodePreviewState).mockReturnValue({ + locatorId: computed(() => createNodeLocatorId(null, mockNodeData.id)), + previewUrls: computed(() => ['blob:preview-url']), + hasPreview: computed(() => true), + latestPreviewUrl: computed(() => 'blob:preview-url'), + shouldShowPreviewImg: computed(() => true) + }) + + renderLGraphNode({ nodeData: mockNodeData }) + + expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:preview-url') + }) + }) })