mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +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>
90 lines
3.1 KiB
TypeScript
90 lines
3.1 KiB
TypeScript
import {
|
|
comfyExpect as expect,
|
|
comfyPageFixture as test
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
|
|
test.describe('@canvas Selection Rectangle', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
|
|
await comfyPage.setup()
|
|
await comfyPage.vueNodes.waitForNodes()
|
|
})
|
|
|
|
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.canvas.press('Control+a')
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(totalCount)
|
|
})
|
|
|
|
test('Click empty space deselects all', async ({ comfyPage }) => {
|
|
await comfyPage.canvas.press('Control+a')
|
|
await comfyPage.nextFrame()
|
|
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.canvas.press('Control+a')
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() => comfyPage.vueNodes.getNodeCount())
|
|
.toBeGreaterThan(1)
|
|
const totalCount = await comfyPage.vueNodes.getNodeCount()
|
|
await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(totalCount)
|
|
})
|
|
})
|