mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## 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>
132 lines
3.9 KiB
TypeScript
132 lines
3.9 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
|
|
/**
|
|
* Returns the client-space position of a group's title bar (for clicking).
|
|
*/
|
|
async function getGroupTitlePosition(
|
|
comfyPage: ComfyPage,
|
|
title: string
|
|
): Promise<{ x: number; y: number }> {
|
|
const pos = await comfyPage.page.evaluate((title) => {
|
|
const app = window.app!
|
|
const group = app.graph.groups.find(
|
|
(g: { title: string }) => g.title === title
|
|
)
|
|
if (!group) return null
|
|
const clientPos = app.canvasPosToClientPos([
|
|
group.pos[0] + 50,
|
|
group.pos[1] + 15
|
|
])
|
|
return { x: clientPos[0], y: clientPos[1] }
|
|
}, title)
|
|
if (!pos) throw new Error(`Group "${title}" not found`)
|
|
return pos
|
|
}
|
|
|
|
/**
|
|
* Returns {selectedNodeCount, selectedGroupCount, selectedItemCount}
|
|
* from the canvas in the browser.
|
|
*/
|
|
async function getSelectionCounts(comfyPage: ComfyPage) {
|
|
return comfyPage.page.evaluate(() => {
|
|
const canvas = window.app!.canvas
|
|
let selectedNodeCount = 0
|
|
let selectedGroupCount = 0
|
|
for (const item of canvas.selectedItems) {
|
|
if ('inputs' in item || 'outputs' in item) selectedNodeCount++
|
|
else selectedGroupCount++
|
|
}
|
|
return {
|
|
selectedNodeCount,
|
|
selectedGroupCount,
|
|
selectedItemCount: canvas.selectedItems.size
|
|
}
|
|
})
|
|
}
|
|
|
|
test.describe('Group Select Children', { tag: ['@canvas', '@node'] }, () => {
|
|
test.afterEach(async ({ comfyPage }) => {
|
|
await comfyPage.canvasOps.resetView()
|
|
})
|
|
|
|
test('Setting enabled: clicking outer group selects nested group and inner node', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting(
|
|
'LiteGraph.Group.SelectChildrenOnClick',
|
|
true
|
|
)
|
|
await comfyPage.workflow.loadWorkflow('groups/nested-groups-1-inner-node')
|
|
await comfyPage.nextFrame()
|
|
|
|
const outerPos = await getGroupTitlePosition(comfyPage, 'Outer Group')
|
|
await comfyPage.canvas.click({ position: outerPos })
|
|
await comfyPage.nextFrame()
|
|
|
|
// Outer Group + Inner Group + 1 node = 3 items
|
|
await expect
|
|
.poll(() => getSelectionCounts(comfyPage))
|
|
.toMatchObject({
|
|
selectedItemCount: 3,
|
|
selectedGroupCount: 2,
|
|
selectedNodeCount: 1
|
|
})
|
|
})
|
|
|
|
test('Setting disabled: clicking outer group selects only the group', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting(
|
|
'LiteGraph.Group.SelectChildrenOnClick',
|
|
false
|
|
)
|
|
await comfyPage.workflow.loadWorkflow('groups/nested-groups-1-inner-node')
|
|
await comfyPage.nextFrame()
|
|
|
|
const outerPos = await getGroupTitlePosition(comfyPage, 'Outer Group')
|
|
await comfyPage.canvas.click({ position: outerPos })
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() => getSelectionCounts(comfyPage))
|
|
.toMatchObject({
|
|
selectedItemCount: 1,
|
|
selectedGroupCount: 1,
|
|
selectedNodeCount: 0
|
|
})
|
|
})
|
|
|
|
test('Deselecting outer group deselects all children', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting(
|
|
'LiteGraph.Group.SelectChildrenOnClick',
|
|
true
|
|
)
|
|
await comfyPage.workflow.loadWorkflow('groups/nested-groups-1-inner-node')
|
|
await comfyPage.nextFrame()
|
|
|
|
// Select the outer group (cascades to children)
|
|
const outerPos = await getGroupTitlePosition(comfyPage, 'Outer Group')
|
|
await comfyPage.canvas.click({ position: outerPos })
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() => getSelectionCounts(comfyPage))
|
|
.toMatchObject({ selectedItemCount: 3 })
|
|
|
|
// Deselect all via page.evaluate to avoid UI overlay interception
|
|
await comfyPage.page.evaluate(() => {
|
|
window.app!.canvas.deselectAll()
|
|
})
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() => getSelectionCounts(comfyPage))
|
|
.toMatchObject({ selectedItemCount: 0 })
|
|
})
|
|
})
|