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>
90 lines
2.7 KiB
TypeScript
90 lines
2.7 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
|
|
async function createSubgraphAndNavigateInto(comfyPage: ComfyPage) {
|
|
const subgraphNode =
|
|
await comfyPage.subgraph.convertDefaultKSamplerToSubgraph()
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
return subgraphNode
|
|
}
|
|
|
|
async function exitSubgraphAndPublish(
|
|
comfyPage: ComfyPage,
|
|
subgraphNode: Awaited<ReturnType<typeof createSubgraphAndNavigateInto>>,
|
|
blueprintName: string
|
|
) {
|
|
await comfyPage.page.keyboard.press('Escape')
|
|
await comfyPage.nextFrame()
|
|
|
|
await subgraphNode.click('title')
|
|
await comfyPage.command.executeCommand('Comfy.PublishSubgraph', {
|
|
name: blueprintName
|
|
})
|
|
|
|
await expect(comfyPage.visibleToasts).toHaveCount(1, { timeout: 5_000 })
|
|
await comfyPage.toast.closeToasts(1)
|
|
}
|
|
|
|
async function searchAndExpectResult(
|
|
comfyPage: ComfyPage,
|
|
searchTerm: string,
|
|
expectedResult: string
|
|
) {
|
|
await comfyPage.command.executeCommand('Workspace.SearchBox.Toggle')
|
|
await expect(comfyPage.searchBox.input).toHaveCount(1)
|
|
await comfyPage.searchBox.input.fill(searchTerm)
|
|
await expect(comfyPage.searchBox.findResult(expectedResult)).toBeVisible({
|
|
timeout: 10_000
|
|
})
|
|
}
|
|
|
|
test.describe('Subgraph Search Aliases', { tag: ['@subgraph'] }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.NodeSearchBoxImpl',
|
|
'v1 (legacy)'
|
|
)
|
|
})
|
|
|
|
test('Can set description on subgraph', async ({ comfyPage }) => {
|
|
await createSubgraphAndNavigateInto(comfyPage)
|
|
|
|
await comfyPage.command.executeCommand('Comfy.Subgraph.SetDescription', {
|
|
description: 'This is a test description'
|
|
})
|
|
await expect
|
|
.poll(() =>
|
|
comfyPage.page.evaluate(() => {
|
|
const subgraph = window.app!.canvas.subgraph
|
|
return (subgraph?.extra as Record<string, unknown>)
|
|
?.BlueprintDescription
|
|
})
|
|
)
|
|
.toBe('This is a test description')
|
|
})
|
|
|
|
test('Published search aliases remain searchable after reload', async ({
|
|
comfyPage
|
|
}) => {
|
|
const subgraphNode = await createSubgraphAndNavigateInto(comfyPage)
|
|
|
|
await comfyPage.command.executeCommand('Comfy.Subgraph.SetSearchAliases', {
|
|
aliases: 'dragon, fire breather'
|
|
})
|
|
|
|
const blueprintName = `test-persist-${Date.now()}`
|
|
await exitSubgraphAndPublish(comfyPage, subgraphNode, blueprintName)
|
|
|
|
await comfyPage.page.reload()
|
|
await comfyPage.page.waitForFunction(
|
|
() => window.app && window.app.extensionManager
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
await searchAndExpectResult(comfyPage, 'dragon', blueprintName)
|
|
})
|
|
})
|