mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## Summary
Internalize `nextFrame()` calls into fixture/helper methods so spec
authors don't need to remember to call it after common operations.
`nextFrame()` waits for one `requestAnimationFrame` (~16ms) — an extra
call is always safe, making this a low-risk refactor.
## Changes
### Phase 1: `SettingsHelper.setSetting()`
`setSetting()` now calls `nextFrame()` internally. Removed 15 redundant
calls across 7 files.
### Phase 2: `CommandHelper.executeCommand()`
`executeCommand()` now calls `nextFrame()` internally. Removed 15
redundant calls across 7 files, including the now-redundant call in
`AppModeHelper.toggleAppMode()`.
### Phase 3: `WorkflowHelper.loadGraphData()`
New helper wraps `page.evaluate(loadGraphData)` + `nextFrame()`.
Migrated `SubgraphHelper.serializeAndReload()` and `groupNode.spec.ts`.
### Phase 4: `NodeReference` cleanup
Removed redundant `nextFrame()` from `copy()`, `convertToGroupNode()`,
`resizeNode()`, `dragTextEncodeNode2()`, and
`convertDefaultKSamplerToSubgraph()`. Removed 6 spec-level calls after
`node.click('title')`.
### Phase 5: `KeyboardHelper.press()` and `delete()`
New convenience methods that press a key and wait one frame. Converted
40 `canvas.press(key)` + `nextFrame()` pairs across 13 spec files.
### Phase 6: `ComfyPage.expectScreenshot()`
New helper combines `nextFrame()` + `toHaveScreenshot()`. Converted 45
pairs across 12 spec files.
## Total impact
- **~130 redundant `nextFrame()` calls eliminated** across ~35
spec/helper files
- **3 new helper methods** added (`loadGraphData`, `press`/`delete`,
`expectScreenshot`)
- **2 existing methods** enhanced (`setSetting`, `executeCommand`)
## What was NOT changed
- `performance.spec.ts` frame-counting loops (intentional)
- `ComfyMouse.ts` / `CanvasHelper.ts` (already internalized)
- `SubgraphHelper.packAllInteriorNodes()` (deliberate orchestration)
- Builder helpers (already internalized)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-11166-refactor-internalize-nextFrame-into-fixture-helper-methods-33f6d73d3650817bb5f6fb46e396085e)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Amp <amp@ampcode.com>
158 lines
5.1 KiB
TypeScript
158 lines
5.1 KiB
TypeScript
import {
|
|
comfyExpect as expect,
|
|
comfyPageFixture as test
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
|
|
type ComfyPage = Parameters<Parameters<typeof test>[2]>[0]['comfyPage']
|
|
|
|
async function setVueMode(comfyPage: ComfyPage, enabled: boolean) {
|
|
await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', enabled)
|
|
if (enabled) {
|
|
await comfyPage.vueNodes.waitForNodes()
|
|
}
|
|
}
|
|
|
|
async function addGhostAtCenter(comfyPage: ComfyPage) {
|
|
await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
|
|
|
|
const viewport = comfyPage.page.viewportSize()!
|
|
const centerX = Math.round(viewport.width / 2)
|
|
const centerY = Math.round(viewport.height / 2)
|
|
|
|
await comfyPage.page.mouse.move(centerX, centerY)
|
|
await comfyPage.nextFrame()
|
|
|
|
const nodeId = await comfyPage.page.evaluate(
|
|
([clientX, clientY]) => {
|
|
const node = window.LiteGraph!.createNode('VAEDecode')!
|
|
const event = new MouseEvent('click', { clientX, clientY })
|
|
window.app!.graph.add(node, { ghost: true, dragEvent: event })
|
|
return node.id
|
|
},
|
|
[centerX, centerY] as const
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
return { nodeId, centerX, centerY }
|
|
}
|
|
|
|
function getNodeById(comfyPage: ComfyPage, nodeId: number | string) {
|
|
return comfyPage.page.evaluate((id) => {
|
|
const node = window.app!.graph.getNodeById(id)
|
|
if (!node) return null
|
|
return { ghost: !!node.flags.ghost }
|
|
}, nodeId)
|
|
}
|
|
|
|
for (const mode of ['litegraph', 'vue'] as const) {
|
|
test.describe(`Ghost node placement (${mode} mode)`, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await setVueMode(comfyPage, mode === 'vue')
|
|
})
|
|
|
|
test('positions ghost node at cursor', async ({ comfyPage }) => {
|
|
await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
|
|
|
|
const viewport = comfyPage.page.viewportSize()!
|
|
const centerX = Math.round(viewport.width / 2)
|
|
const centerY = Math.round(viewport.height / 2)
|
|
|
|
await comfyPage.page.mouse.move(centerX, centerY)
|
|
await comfyPage.nextFrame()
|
|
|
|
const result = await comfyPage.page.evaluate(
|
|
([clientX, clientY]) => {
|
|
const node = window.LiteGraph!.createNode('VAEDecode')!
|
|
const event = new MouseEvent('click', { clientX, clientY })
|
|
window.app!.graph.add(node, { ghost: true, dragEvent: event })
|
|
|
|
const canvas = window.app!.canvas
|
|
const rect = canvas.canvas.getBoundingClientRect()
|
|
const cursorCanvasX =
|
|
(clientX - rect.left) / canvas.ds.scale - canvas.ds.offset[0]
|
|
const cursorCanvasY =
|
|
(clientY - rect.top) / canvas.ds.scale - canvas.ds.offset[1]
|
|
|
|
return {
|
|
diffX: node.pos[0] + node.size[0] / 2 - cursorCanvasX,
|
|
diffY: node.pos[1] - 10 - cursorCanvasY
|
|
}
|
|
},
|
|
[centerX, centerY] as const
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
expect(Math.abs(result.diffX)).toBeLessThan(5)
|
|
expect(Math.abs(result.diffY)).toBeLessThan(5)
|
|
})
|
|
|
|
test('left-click confirms ghost placement', async ({ comfyPage }) => {
|
|
const { nodeId, centerX, centerY } = await addGhostAtCenter(comfyPage)
|
|
|
|
const before = await getNodeById(comfyPage, nodeId)
|
|
expect(before).not.toBeNull()
|
|
expect(before!.ghost).toBe(true)
|
|
|
|
await comfyPage.page.mouse.click(centerX, centerY)
|
|
await comfyPage.nextFrame()
|
|
|
|
const after = await getNodeById(comfyPage, nodeId)
|
|
expect(after).not.toBeNull()
|
|
expect(after!.ghost).toBe(false)
|
|
})
|
|
|
|
test('Escape cancels ghost placement', async ({ comfyPage }) => {
|
|
const { nodeId } = await addGhostAtCenter(comfyPage)
|
|
|
|
const before = await getNodeById(comfyPage, nodeId)
|
|
expect(before).not.toBeNull()
|
|
expect(before!.ghost).toBe(true)
|
|
|
|
await comfyPage.keyboard.press('Escape')
|
|
|
|
const after = await getNodeById(comfyPage, nodeId)
|
|
expect(after).toBeNull()
|
|
})
|
|
|
|
test('Delete cancels ghost placement', async ({ comfyPage }) => {
|
|
const { nodeId } = await addGhostAtCenter(comfyPage)
|
|
|
|
const before = await getNodeById(comfyPage, nodeId)
|
|
expect(before).not.toBeNull()
|
|
expect(before!.ghost).toBe(true)
|
|
|
|
await comfyPage.keyboard.press('Delete')
|
|
|
|
const after = await getNodeById(comfyPage, nodeId)
|
|
expect(after).toBeNull()
|
|
})
|
|
|
|
test('Backspace cancels ghost placement', async ({ comfyPage }) => {
|
|
const { nodeId } = await addGhostAtCenter(comfyPage)
|
|
|
|
const before = await getNodeById(comfyPage, nodeId)
|
|
expect(before).not.toBeNull()
|
|
expect(before!.ghost).toBe(true)
|
|
|
|
await comfyPage.keyboard.press('Backspace')
|
|
|
|
const after = await getNodeById(comfyPage, nodeId)
|
|
expect(after).toBeNull()
|
|
})
|
|
|
|
test('right-click cancels ghost placement', async ({ comfyPage }) => {
|
|
const { nodeId, centerX, centerY } = await addGhostAtCenter(comfyPage)
|
|
|
|
const before = await getNodeById(comfyPage, nodeId)
|
|
expect(before).not.toBeNull()
|
|
expect(before!.ghost).toBe(true)
|
|
|
|
await comfyPage.page.mouse.click(centerX, centerY, { button: 'right' })
|
|
await comfyPage.nextFrame()
|
|
|
|
const after = await getNodeById(comfyPage, nodeId)
|
|
expect(after).toBeNull()
|
|
})
|
|
})
|
|
}
|