mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +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>
151 lines
5.2 KiB
TypeScript
151 lines
5.2 KiB
TypeScript
import {
|
|
comfyExpect as expect,
|
|
comfyPageFixture as test
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import { fitToViewInstant } from '@e2e/helpers/fitToView'
|
|
|
|
test.describe('Vue Node Bring to Front', { tag: '@screenshot' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
|
|
await comfyPage.workflow.loadWorkflow('vueNodes/simple-triple')
|
|
await comfyPage.vueNodes.waitForNodes()
|
|
await fitToViewInstant(comfyPage)
|
|
})
|
|
|
|
/**
|
|
* Helper to get the z-index of a node by its title
|
|
*/
|
|
async function getNodeZIndex(
|
|
comfyPage: ComfyPage,
|
|
title: string
|
|
): Promise<number> {
|
|
const node = comfyPage.vueNodes.getNodeByTitle(title)
|
|
const style = await node.getAttribute('style')
|
|
const match = style?.match(/z-index:\s*(\d+)/)
|
|
return match ? parseInt(match[1], 10) : Number.NaN
|
|
}
|
|
|
|
/**
|
|
* Helper to get the bounding box center of a node
|
|
*/
|
|
async function getNodeCenter(
|
|
comfyPage: ComfyPage,
|
|
title: string
|
|
): Promise<{ x: number; y: number }> {
|
|
const node = comfyPage.vueNodes.getNodeByTitle(title)
|
|
const box = await node.boundingBox()
|
|
if (!box) throw new Error(`Node "${title}" not found`)
|
|
return { x: box.x + box.width / 2, y: box.y + box.height / 2 }
|
|
}
|
|
|
|
test('should bring overlapped node to front when clicking on it', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Get initial positions
|
|
const clipCenter = await getNodeCenter(comfyPage, 'CLIP Text Encode')
|
|
const ksamplerHeader = await comfyPage.page
|
|
.getByText('KSampler')
|
|
.boundingBox()
|
|
if (!ksamplerHeader) throw new Error('KSampler header not found')
|
|
|
|
// Drag KSampler on top of CLIP Text Encode
|
|
await comfyPage.canvasOps.dragAndDrop(
|
|
{ x: ksamplerHeader.x + 50, y: ksamplerHeader.y + 10 },
|
|
clipCenter
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
// Screenshot showing KSampler on top of CLIP
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'bring-to-front-overlapped-before.png'
|
|
)
|
|
|
|
// KSampler should be on top (higher z-index) after being dragged
|
|
await expect
|
|
.poll(async () => {
|
|
const ksamplerZ = await getNodeZIndex(comfyPage, 'KSampler')
|
|
const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
|
|
return ksamplerZ - clipZ
|
|
})
|
|
.toBeGreaterThan(0)
|
|
|
|
// Click on CLIP Text Encode (underneath) - need to click on a visible part
|
|
// Since KSampler is on top, we click on the edge of CLIP that should still be visible
|
|
const clipNode = comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode')
|
|
const clipBox = await clipNode.boundingBox()
|
|
if (!clipBox) throw new Error('CLIP node not found')
|
|
|
|
// Click on a visible edge of CLIP
|
|
await comfyPage.page.mouse.click(clipBox.x + 30, clipBox.y + 10)
|
|
await comfyPage.nextFrame()
|
|
|
|
// CLIP should now be on top - compare post-action z-indices
|
|
await expect
|
|
.poll(async () => {
|
|
const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
|
|
const ksamplerZ = await getNodeZIndex(comfyPage, 'KSampler')
|
|
return clipZ - ksamplerZ
|
|
})
|
|
.toBeGreaterThan(0)
|
|
|
|
// Screenshot showing CLIP now on top
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'bring-to-front-overlapped-after.png'
|
|
)
|
|
})
|
|
|
|
test('should bring overlapped node to front when clicking on its widget', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Get CLIP Text Encode position (it has a text widget)
|
|
const clipCenter = await getNodeCenter(comfyPage, 'CLIP Text Encode')
|
|
|
|
// Get VAE Decode position and drag it on top of CLIP
|
|
const vaeHeader = await comfyPage.page.getByText('VAE Decode').boundingBox()
|
|
if (!vaeHeader) throw new Error('VAE Decode header not found')
|
|
|
|
await comfyPage.canvasOps.dragAndDrop(
|
|
{ x: vaeHeader.x + 50, y: vaeHeader.y + 10 },
|
|
{ x: clipCenter.x - 50, y: clipCenter.y }
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
// VAE should be on top after drag
|
|
await expect
|
|
.poll(async () => {
|
|
const vaeZ = await getNodeZIndex(comfyPage, 'VAE Decode')
|
|
const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
|
|
return vaeZ - clipZ
|
|
})
|
|
.toBeGreaterThan(0)
|
|
|
|
// Screenshot showing VAE on top
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'bring-to-front-widget-overlapped-before.png'
|
|
)
|
|
|
|
// Click on the text widget of CLIP Text Encode
|
|
const clipNode = comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode')
|
|
const clipBox = await clipNode.boundingBox()
|
|
if (!clipBox) throw new Error('CLIP node not found')
|
|
await comfyPage.page.mouse.click(clipBox.x + 170, clipBox.y + 80)
|
|
await comfyPage.nextFrame()
|
|
|
|
// CLIP should now be on top - compare post-action z-indices
|
|
await expect
|
|
.poll(async () => {
|
|
const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
|
|
const vaeZ = await getNodeZIndex(comfyPage, 'VAE Decode')
|
|
return clipZ - vaeZ
|
|
})
|
|
.toBeGreaterThan(0)
|
|
|
|
// Screenshot showing CLIP now on top after widget click
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'bring-to-front-widget-overlapped-after.png'
|
|
)
|
|
})
|
|
})
|