mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +00:00
## Summary Extract repeated patterns from 12 subgraph Playwright spec files into shared test utilities, reducing duplication by ~142 lines. ## Changes - **What**: New shared helpers for common subgraph test operations: - `SubgraphHelper`: `getSlotCount()`, `getSlotLabel()`, `removeSlot()`, `findSubgraphNodeId()` - `NodeReference`: `delete()` - `subgraphTestUtils`: `serializeAndReload()`, `convertDefaultKSamplerToSubgraph()`, `expectWidgetBelowHeader()`, `collectConsoleWarnings()`, `packAllInteriorNodes()` - Replaced ~72 inline `page.evaluate` blocks and multi-line sequences with single helper calls across 12 spec files ## Review Focus - Behavioral equivalence: every replacement is a mechanical extraction with no test logic changes - API surface of new helpers: naming, parameter types, placement in existing utility classes - Whether any remaining inline patterns in the spec files would benefit from further extraction ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-10629-test-extract-shared-subgraph-E2E-test-utilities-3306d73d365081b0b6b5db52ed0a4552) by [Unito](https://www.unito.io) --------- Co-authored-by: Amp <amp@ampcode.com>
108 lines
4.0 KiB
TypeScript
108 lines
4.0 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '../fixtures/ComfyPage'
|
|
|
|
test.describe(
|
|
'Subgraph progress clear on navigation',
|
|
{ tag: ['@subgraph'] },
|
|
() => {
|
|
test('Stale progress is cleared on subgraph node after navigating back', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
|
|
await comfyPage.nextFrame()
|
|
|
|
// Find the subgraph node
|
|
const subgraphNodeId = await comfyPage.subgraph.findSubgraphNodeId()
|
|
|
|
// Simulate a stale progress value on the subgraph node.
|
|
// This happens when:
|
|
// 1. User views root graph during execution
|
|
// 2. Progress watcher sets node.progress = 0.5
|
|
// 3. User enters subgraph
|
|
// 4. Execution completes (nodeProgressStates becomes {})
|
|
// 5. Watcher fires, clears subgraph-internal nodes, but root-level
|
|
// SubgraphNode isn't visible so it keeps stale progress
|
|
// 6. User navigates back — watcher should fire and clear it
|
|
await comfyPage.page.evaluate((nodeId) => {
|
|
const node = window.app!.canvas.graph!.getNodeById(nodeId)!
|
|
node.progress = 0.5
|
|
}, subgraphNodeId)
|
|
|
|
// Verify progress is set
|
|
const progressBefore = await comfyPage.page.evaluate((nodeId) => {
|
|
return window.app!.canvas.graph!.getNodeById(nodeId)!.progress
|
|
}, subgraphNodeId)
|
|
expect(progressBefore).toBe(0.5)
|
|
|
|
// Navigate into the subgraph
|
|
const subgraphNode =
|
|
await comfyPage.nodeOps.getNodeRefById(subgraphNodeId)
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
|
|
// Verify we're inside the subgraph
|
|
expect(await comfyPage.subgraph.isInSubgraph()).toBe(true)
|
|
|
|
// Navigate back to the root graph
|
|
await comfyPage.page.keyboard.press('Escape')
|
|
await comfyPage.nextFrame()
|
|
|
|
// The progress watcher should fire when graph changes (because
|
|
// nodeLocationProgressStates is empty {} and the watcher should
|
|
// iterate canvas.graph.nodes to clear stale node.progress values).
|
|
//
|
|
// BUG: Without watching canvasStore.currentGraph, the watcher doesn't
|
|
// fire on subgraph->root navigation when progress is already empty,
|
|
// leaving stale node.progress = 0.5 on the SubgraphNode.
|
|
await expect(async () => {
|
|
const progressAfter = await comfyPage.page.evaluate((nodeId) => {
|
|
return window.app!.canvas.graph!.getNodeById(nodeId)!.progress
|
|
}, subgraphNodeId!)
|
|
expect(progressAfter).toBeUndefined()
|
|
}).toPass({ timeout: 2_000 })
|
|
})
|
|
|
|
test('Stale progress is cleared when switching workflows while inside subgraph', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
|
|
await comfyPage.nextFrame()
|
|
|
|
const subgraphNodeId = await comfyPage.subgraph.findSubgraphNodeId()
|
|
|
|
await comfyPage.page.evaluate((nodeId) => {
|
|
const node = window.app!.canvas.graph!.getNodeById(nodeId)!
|
|
node.progress = 0.7
|
|
}, subgraphNodeId)
|
|
|
|
const subgraphNode =
|
|
await comfyPage.nodeOps.getNodeRefById(subgraphNodeId)
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
|
|
expect(await comfyPage.subgraph.isInSubgraph()).toBe(true)
|
|
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
await comfyPage.nextFrame()
|
|
|
|
await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(async () => {
|
|
const subgraphProgressState = await comfyPage.page.evaluate(() => {
|
|
const graph = window.app!.canvas.graph!
|
|
const subgraphNode = graph.nodes.find(
|
|
(n) => typeof n.isSubgraphNode === 'function' && n.isSubgraphNode()
|
|
)
|
|
if (!subgraphNode) {
|
|
return { exists: false, progress: null }
|
|
}
|
|
|
|
return { exists: true, progress: subgraphNode.progress }
|
|
})
|
|
expect(subgraphProgressState.exists).toBe(true)
|
|
expect(subgraphProgressState.progress).toBeUndefined()
|
|
}).toPass({ timeout: 5_000 })
|
|
})
|
|
}
|
|
)
|