mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +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>
54 lines
1.4 KiB
TypeScript
54 lines
1.4 KiB
TypeScript
import type { Locator, Page } from '@playwright/test'
|
|
|
|
import { nextFrame } from '@e2e/fixtures/utils/timing'
|
|
|
|
export class KeyboardHelper {
|
|
constructor(
|
|
private readonly page: Page,
|
|
private readonly canvas: Locator
|
|
) {}
|
|
|
|
async press(key: string, locator?: Locator | null): Promise<void> {
|
|
const target = locator ?? this.canvas
|
|
await target.press(key)
|
|
await nextFrame(this.page)
|
|
}
|
|
|
|
async delete(locator?: Locator | null): Promise<void> {
|
|
await this.press('Delete', locator)
|
|
}
|
|
|
|
async ctrlSend(
|
|
keyToPress: string,
|
|
locator: Locator | null = this.canvas
|
|
): Promise<void> {
|
|
const target = locator ?? this.page.keyboard
|
|
await target.press(`Control+${keyToPress}`)
|
|
await nextFrame(this.page)
|
|
}
|
|
|
|
async selectAll(locator?: Locator | null): Promise<void> {
|
|
await this.ctrlSend('KeyA', locator)
|
|
}
|
|
|
|
async bypass(locator?: Locator | null): Promise<void> {
|
|
await this.ctrlSend('KeyB', locator)
|
|
}
|
|
|
|
async undo(locator?: Locator | null): Promise<void> {
|
|
await this.ctrlSend('KeyZ', locator)
|
|
}
|
|
|
|
async redo(locator?: Locator | null): Promise<void> {
|
|
await this.ctrlSend('KeyY', locator)
|
|
}
|
|
|
|
async moveUp(locator?: Locator | null): Promise<void> {
|
|
await this.ctrlSend('ArrowUp', locator)
|
|
}
|
|
|
|
async moveDown(locator?: Locator | null): Promise<void> {
|
|
await this.ctrlSend('ArrowDown', locator)
|
|
}
|
|
}
|