mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-11 08:20:53 +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>
100 lines
3.1 KiB
TypeScript
100 lines
3.1 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
import { TestIds } from '@e2e/fixtures/selectors'
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
})
|
|
|
|
test.describe('Graph Canvas Menu', { tag: ['@screenshot', '@canvas'] }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
// Set link render mode to spline to make sure it's not affected by other tests'
|
|
// side effects.
|
|
await comfyPage.settings.setSetting('Comfy.LinkRenderMode', 2)
|
|
// Enable canvas menu for all tests
|
|
await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
|
|
})
|
|
|
|
test(
|
|
'Can toggle link visibility',
|
|
{ tag: '@screenshot' },
|
|
async ({ comfyPage }) => {
|
|
const button = comfyPage.page.getByTestId(
|
|
TestIds.canvas.toggleLinkVisibilityButton
|
|
)
|
|
await button.click()
|
|
await comfyPage.expectScreenshot(
|
|
comfyPage.canvas,
|
|
'canvas-with-hidden-links.png'
|
|
)
|
|
const hiddenLinkRenderMode = await comfyPage.page.evaluate(() => {
|
|
return window.LiteGraph!.HIDDEN_LINK
|
|
})
|
|
await expect
|
|
.poll(() => comfyPage.settings.getSetting('Comfy.LinkRenderMode'))
|
|
.toBe(hiddenLinkRenderMode)
|
|
|
|
await button.click()
|
|
await comfyPage.expectScreenshot(
|
|
comfyPage.canvas,
|
|
'canvas-with-visible-links.png'
|
|
)
|
|
await expect
|
|
.poll(() => comfyPage.settings.getSetting('Comfy.LinkRenderMode'))
|
|
.not.toBe(hiddenLinkRenderMode)
|
|
}
|
|
)
|
|
|
|
test('Toggle minimap button is clickable and has correct test id', async ({
|
|
comfyPage
|
|
}) => {
|
|
const minimapButton = comfyPage.page.getByTestId(
|
|
TestIds.canvas.toggleMinimapButton
|
|
)
|
|
await expect(minimapButton).toBeVisible()
|
|
await expect(minimapButton).toBeEnabled()
|
|
|
|
// Test that the button can be clicked without error
|
|
await minimapButton.click()
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
test('Fit view button is present and clickable', async ({ comfyPage }) => {
|
|
const fitViewButton = comfyPage.page
|
|
.locator('button')
|
|
.filter({ has: comfyPage.page.locator('.icon-\\[lucide--focus\\]') })
|
|
await expect(fitViewButton).toBeVisible()
|
|
await fitViewButton.click()
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
test('Zoom controls popup opens and closes', async ({ comfyPage }) => {
|
|
// Find the zoom button by its percentage text content
|
|
const zoomButton = comfyPage.page.locator('button').filter({
|
|
hasText: '%'
|
|
})
|
|
await expect(zoomButton).toBeVisible()
|
|
|
|
// Click to open zoom controls
|
|
await zoomButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
// Zoom controls modal should be visible
|
|
const zoomModal = comfyPage.page
|
|
.locator('div')
|
|
.filter({
|
|
hasText: 'Zoom To Fit'
|
|
})
|
|
.first()
|
|
await expect(zoomModal).toBeVisible()
|
|
|
|
// Click backdrop to close
|
|
const backdrop = comfyPage.page.locator('.fixed.inset-0').first()
|
|
await backdrop.click()
|
|
|
|
// Modal should be hidden
|
|
await expect(zoomModal).toBeHidden()
|
|
})
|
|
})
|