mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
0132c77c7d
## Summary
Harden 98 E2E spec files and 8 fixtures/helpers for deterministic CI
runs by replacing race-prone patterns with retry-safe alternatives.
No source code changes -- only `browser_tests/` is touched.
## Changes
- **E2E spec hardening** (98 spec files, 6 fixtures, 2 helpers):
| Fix class | Sites | Examples |
|-----------|-------|---------:|
| `expect(await ...)` -> `expect.poll()` | ~153 | interaction,
defaultKeybindings, workflows, featureFlags |
| `const x = await loc.count(); expect(x)` -> `toHaveCount()` | ~19 |
menu, linkInteraction, assets, bottomPanelShortcuts |
| `nextFrame()` -> `waitForHidden()` after menu clicks | ~22 |
contextMenu, rightClickMenu, subgraphHelper |
| Redundant `nextFrame()` removed | many | defaultKeybindings, minimap,
builderSaveFlow |
| `expect(async () => { ... }).toPass()` retry blocks | 5 | interaction
(graphdialog dismiss guard) |
| `force:true` removed from `BaseDialog.close()` | 1 | BaseDialog
fixture |
| ContextMenu `waitForHidden` simplified (check-then-act race removed) |
1 | ContextMenu fixture |
| Non-deterministic node order -> proximity-based selection | 1 |
interaction (toggle dom widget) |
| Tight poll timeout (250ms) -> >=2000ms | 2 | templates |
- **Helper improvements**: Exposed locator getters on
`ComfyPage.domWidgets`, `ToastHelper.toastErrors`, and
`WorkflowsSidebarTab.activeWorkflowLabel` so callers can use retrying
assertions (`toHaveCount()`, `toHaveText()`) directly.
- **Flake pattern catalog**: Added section 7 table to
`browser_tests/FLAKE_PREVENTION_RULES.md` documenting 8 pattern classes
for reviewers and future authors.
- **Docs**: Fixed bad examples in `browser_tests/README.md` to use
`expect.poll()`.
- **Breaking**: None
- **Dependencies**: None
## Review Focus
- All fixes follow the rules in
`browser_tests/FLAKE_PREVENTION_RULES.md`
- No behavioral changes to tests -- only timing/retry strategy is
updated
- The `ContextMenu.waitForHidden` simplification removes a
swallowed-error anti-pattern; both locators now use direct `waitFor({
state: 'hidden' })`
---------
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: github-actions <github-actions@github.com>
244 lines
9.1 KiB
TypeScript
244 lines
9.1 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { NodeBadgeMode } from '@/types/nodeSource'
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
})
|
|
|
|
test.describe(
|
|
'Canvas Right Click Menu',
|
|
{ tag: ['@screenshot', '@ui'] },
|
|
() => {
|
|
test('Can add node', async ({ comfyPage }) => {
|
|
await comfyPage.canvasOps.rightClick()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
|
|
await comfyPage.page.getByText('Add Node').click()
|
|
await comfyPage.page.getByText('loaders').click()
|
|
await comfyPage.page.getByText('Load VAE').click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('add-node-node-added.png')
|
|
})
|
|
|
|
test('Can add group', async ({ comfyPage }) => {
|
|
await comfyPage.canvasOps.rightClick()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
|
|
await comfyPage.page.getByText('Add Group', { exact: true }).click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'add-group-group-added.png'
|
|
)
|
|
})
|
|
|
|
test('Can convert to group node', async ({ comfyPage }) => {
|
|
await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
|
|
await expect(comfyPage.canvas).toHaveScreenshot('selected-2-nodes.png')
|
|
await comfyPage.canvasOps.rightClick()
|
|
await comfyPage.contextMenu.clickMenuItem(
|
|
'Convert to Group Node (Deprecated)'
|
|
)
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nodeOps.promptDialogInput.fill('GroupNode2CLIP')
|
|
await comfyPage.page.keyboard.press('Enter')
|
|
await comfyPage.nodeOps.promptDialogInput.waitFor({ state: 'hidden' })
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-group-node.png'
|
|
)
|
|
})
|
|
}
|
|
)
|
|
|
|
test.describe('Node Right Click Menu', { tag: ['@screenshot', '@ui'] }, () => {
|
|
test('Can open properties panel', async ({ comfyPage }) => {
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.getByText('Properties Panel').click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-properties-panel.png'
|
|
)
|
|
})
|
|
|
|
test('Can collapse', async ({ comfyPage }) => {
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.getByText('Collapse').click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-collapsed.png'
|
|
)
|
|
})
|
|
|
|
test('Can collapse (Node Badge)', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.NodeBadge.NodeIdBadgeMode',
|
|
NodeBadgeMode.ShowAll
|
|
)
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.NodeBadge.NodeSourceBadgeMode',
|
|
NodeBadgeMode.ShowAll
|
|
)
|
|
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.getByText('Collapse').click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-collapsed-badge.png'
|
|
)
|
|
})
|
|
|
|
test('Can bypass', async ({ comfyPage }) => {
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.getByText('Bypass').click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-bypassed.png'
|
|
)
|
|
})
|
|
|
|
test('Can pin and unpin', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.Graph.AutoPanSpeed', 0)
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
|
|
// Get EmptyLatentImage node title position dynamically (for dragging)
|
|
const emptyLatentNode = await comfyPage.nodeOps.getNodeRefById(5)
|
|
const titlePos = await emptyLatentNode.getTitlePosition()
|
|
await comfyPage.canvasOps.dragAndDrop(titlePos, { x: 16, y: 16 })
|
|
await expect(comfyPage.canvas).toHaveScreenshot('node-pinned.png')
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-pinned-node.png'
|
|
)
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-unpinned-node.png'
|
|
)
|
|
})
|
|
|
|
test('Can move after unpin', async ({ comfyPage }) => {
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
|
|
// Get EmptyLatentImage node title position dynamically (for dragging)
|
|
const emptyLatentNode = await comfyPage.nodeOps.getNodeRefById(5)
|
|
const titlePos = await emptyLatentNode.getTitlePosition()
|
|
await comfyPage.canvasOps.dragAndDrop(titlePos, { x: 200, y: 590 })
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-unpinned-node-moved.png'
|
|
)
|
|
})
|
|
|
|
test('Can pin/unpin selected nodes', async ({ comfyPage }) => {
|
|
await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
|
|
await comfyPage.page.keyboard.down('Control')
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
|
|
await comfyPage.page.keyboard.up('Control')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('selected-nodes-pinned.png')
|
|
await comfyPage.canvas.click({
|
|
position: DefaultGraphPositions.emptyLatentWidgetClick,
|
|
button: 'right'
|
|
})
|
|
await comfyPage.page.mouse.move(10, 10)
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'selected-nodes-unpinned.png'
|
|
)
|
|
})
|
|
|
|
test('Can clone pinned nodes', async ({ comfyPage }) => {
|
|
const nodeCount = await comfyPage.nodeOps.getGraphNodesCount()
|
|
const node = (await comfyPage.nodeOps.getFirstNodeRef())!
|
|
await node.clickContextMenuOption('Pin')
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await node.click('title', { button: 'right' })
|
|
await expect(
|
|
comfyPage.page.locator('.litemenu-entry:has-text("Unpin")')
|
|
).toBeAttached()
|
|
const cloneItem = comfyPage.page.locator(
|
|
'.litemenu-entry:has-text("Clone")'
|
|
)
|
|
await cloneItem.click()
|
|
await comfyPage.contextMenu.waitForHidden()
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getGraphNodesCount())
|
|
.toBe(nodeCount + 1)
|
|
})
|
|
})
|