mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +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>
55 lines
1.7 KiB
TypeScript
55 lines
1.7 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
import type { Locator } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
|
|
async function verifyCustomIconSvg(iconElement: Locator) {
|
|
await expect
|
|
.poll(async () => {
|
|
const svgVariable = await iconElement.evaluate((element) =>
|
|
getComputedStyle(element).getPropertyValue('--svg')
|
|
)
|
|
if (!svgVariable) return null
|
|
const dataUrlMatch = svgVariable.match(
|
|
/url\("data:image\/svg\+xml,([^"]+)"\)/
|
|
)
|
|
if (!dataUrlMatch) return null
|
|
return decodeURIComponent(dataUrlMatch[1])
|
|
})
|
|
.toContain("<svg xmlns='http://www.w3.org/2000/svg'")
|
|
}
|
|
|
|
test.describe('Custom Icons', { tag: '@settings' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
test('sidebar tab icons use custom SVGs', async ({ comfyPage }) => {
|
|
// Find the icon in the sidebar
|
|
const icon = comfyPage.page.locator(
|
|
'.icon-\\[comfy--ai-model\\].side-bar-button-icon'
|
|
)
|
|
await expect(icon).toBeVisible()
|
|
|
|
// Verify the custom SVG content
|
|
await verifyCustomIconSvg(icon)
|
|
})
|
|
|
|
test('Browse Templates menu item uses custom template icon', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Open the topbar menu
|
|
await comfyPage.menu.topbar.openTopbarMenu()
|
|
const menuItem = comfyPage.menu.topbar.getMenuItem('Browse Templates')
|
|
|
|
// Find the icon as a previous sibling of the menu item label
|
|
const templateIcon = menuItem
|
|
.locator('..')
|
|
.locator('.icon-\\[comfy--template\\]')
|
|
await expect(templateIcon).toBeVisible()
|
|
|
|
// Verify the custom SVG content
|
|
await verifyCustomIconSvg(templateIcon)
|
|
})
|
|
})
|