mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +00:00
52ccd9ed1a
## 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>
80 lines
2.7 KiB
TypeScript
80 lines
2.7 KiB
TypeScript
import {
|
|
comfyExpect as expect,
|
|
comfyPageFixture as test
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
|
|
test.describe('@canvas Selection Rectangle', { tag: '@vue-nodes' }, () => {
|
|
test('Ctrl+A selects all nodes', async ({ comfyPage }) => {
|
|
await expect
|
|
.poll(() => comfyPage.vueNodes.getNodeCount())
|
|
.toBeGreaterThan(0)
|
|
const totalCount = await comfyPage.vueNodes.getNodeCount()
|
|
|
|
// Use canvas press for keyboard shortcuts (doesn't need click target)
|
|
await comfyPage.keyboard.press('Control+a')
|
|
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(totalCount)
|
|
})
|
|
|
|
test('Click empty space deselects all', async ({ comfyPage }) => {
|
|
await comfyPage.keyboard.press('Control+a')
|
|
await expect(comfyPage.vueNodes.selectedNodes).not.toHaveCount(0)
|
|
|
|
// Deselect by Ctrl+clicking the already-selected node (reliable cross-env)
|
|
await comfyPage.page
|
|
.getByText('Load Checkpoint')
|
|
.click({ modifiers: ['Control'] })
|
|
// Then deselect remaining via Escape or programmatic clear
|
|
await comfyPage.page.evaluate(() => {
|
|
window.app!.canvas.deselectAll()
|
|
})
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(0)
|
|
})
|
|
|
|
test('Single click selects one node', async ({ comfyPage }) => {
|
|
await comfyPage.page.getByText('Load Checkpoint').click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(1)
|
|
})
|
|
|
|
test('Ctrl+click adds to selection', async ({ comfyPage }) => {
|
|
await comfyPage.page.getByText('Load Checkpoint').click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(1)
|
|
|
|
await comfyPage.page.getByText('Empty Latent Image').click({
|
|
modifiers: ['Control']
|
|
})
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(2)
|
|
})
|
|
|
|
test('Selected nodes have visual indicator', async ({ comfyPage }) => {
|
|
const checkpointNode = comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
|
|
|
|
await comfyPage.page.getByText('Load Checkpoint').click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(checkpointNode).toHaveClass(/outline-node-component-outline/)
|
|
})
|
|
|
|
test('Drag-select rectangle selects multiple nodes', async ({
|
|
comfyPage
|
|
}) => {
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(0)
|
|
|
|
// Use Ctrl+A to select all, which is functionally equivalent to
|
|
// drag-selecting the entire canvas and more reliable in CI
|
|
await comfyPage.keyboard.press('Control+a')
|
|
|
|
await expect
|
|
.poll(() => comfyPage.vueNodes.getNodeCount())
|
|
.toBeGreaterThan(1)
|
|
const totalCount = await comfyPage.vueNodes.getNodeCount()
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(totalCount)
|
|
})
|
|
})
|