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>
132 lines
4.1 KiB
TypeScript
132 lines
4.1 KiB
TypeScript
import type { Response } from '@playwright/test'
|
|
import { expect, mergeTests } from '@playwright/test'
|
|
|
|
import type { StatusWsMessage } from '@/schemas/apiSchema'
|
|
import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
|
|
import { webSocketFixture } from '@e2e/fixtures/ws'
|
|
import type { WorkspaceStore } from '@e2e/types/globals'
|
|
|
|
const test = mergeTests(comfyPageFixture, webSocketFixture)
|
|
|
|
test.describe('Actionbar', { tag: '@ui' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
/**
|
|
* This test ensures that the autoqueue change mode can only queue one change at a time
|
|
*/
|
|
test('Does not auto-queue multiple changes at a time', async ({
|
|
comfyPage,
|
|
ws
|
|
}) => {
|
|
// Enable change auto-queue mode
|
|
const queueOpts = await comfyPage.actionbar.queueButton.toggleOptions()
|
|
await expect.poll(() => queueOpts.getMode()).toBe('disabled')
|
|
await queueOpts.setMode('change')
|
|
await comfyPage.nextFrame()
|
|
await expect.poll(() => queueOpts.getMode()).toBe('change')
|
|
await comfyPage.actionbar.queueButton.toggleOptions()
|
|
|
|
// Intercept the prompt queue endpoint
|
|
let promptNumber = 0
|
|
await comfyPage.page.route('**/api/prompt', async (route, req) => {
|
|
await new Promise((r) => setTimeout(r, 100))
|
|
await route.fulfill({
|
|
status: 200,
|
|
body: JSON.stringify({
|
|
prompt_id: promptNumber,
|
|
number: ++promptNumber,
|
|
node_errors: {},
|
|
// Include the request data to validate which prompt was queued so we can validate the width
|
|
__request: req.postDataJSON()
|
|
})
|
|
})
|
|
})
|
|
|
|
// Start watching for a message to prompt
|
|
const requestPromise = comfyPage.page.waitForResponse('**/api/prompt')
|
|
|
|
// Find and set the width on the latent node
|
|
const triggerChange = async (value: number) => {
|
|
return await comfyPage.page.evaluate((value) => {
|
|
const node = window.app!.graph!._nodes.find(
|
|
(n) => n.type === 'EmptyLatentImage'
|
|
)
|
|
node!.widgets![0].value = value
|
|
|
|
;(
|
|
window.app!.extensionManager as WorkspaceStore
|
|
).workflow.activeWorkflow?.changeTracker.checkState()
|
|
}, value)
|
|
}
|
|
|
|
// Trigger a status websocket message
|
|
const triggerStatus = async (queueSize: number) => {
|
|
await ws.trigger({
|
|
type: 'status',
|
|
data: {
|
|
status: {
|
|
exec_info: {
|
|
queue_remaining: queueSize
|
|
}
|
|
}
|
|
}
|
|
} as StatusWsMessage)
|
|
}
|
|
|
|
// Extract the width from the queue response
|
|
const getQueuedWidth = async (resp: Promise<Response>) => {
|
|
const obj = await (await resp).json()
|
|
return obj['__request']['prompt']['5']['inputs']['width']
|
|
}
|
|
|
|
// Trigger a bunch of changes
|
|
const START = 32
|
|
const END = 64
|
|
for (let i = START; i <= END; i += 8) {
|
|
await triggerChange(i)
|
|
}
|
|
|
|
// Ensure the queued width is the first value
|
|
expect(
|
|
await getQueuedWidth(requestPromise),
|
|
'the first queued prompt should be the first change width'
|
|
).toBe(START)
|
|
|
|
// Ensure that no other changes are queued
|
|
await expect(
|
|
comfyPage.page.waitForResponse('**/api/prompt', { timeout: 250 })
|
|
).rejects.toThrow()
|
|
expect(
|
|
promptNumber,
|
|
'only 1 prompt should have been queued even though there were multiple changes'
|
|
).toBe(1)
|
|
|
|
// Trigger a status update so auto-queue re-runs
|
|
await triggerStatus(1)
|
|
await triggerStatus(0)
|
|
|
|
// Ensure the queued width is the last queued value
|
|
expect(
|
|
await getQueuedWidth(comfyPage.page.waitForResponse('**/api/prompt')),
|
|
'last queued prompt width should be the last change'
|
|
).toBe(END)
|
|
expect(promptNumber, 'queued prompt count should be 2').toBe(2)
|
|
})
|
|
|
|
test('Can dock actionbar into top menu', async ({ comfyPage }) => {
|
|
await comfyPage.page.dragAndDrop(
|
|
'.actionbar .drag-handle',
|
|
'.actionbar-container',
|
|
{
|
|
targetPosition: { x: 50, y: 20 },
|
|
force: true
|
|
}
|
|
)
|
|
await expect(comfyPage.actionbar.root.locator('.actionbar')).toHaveClass(
|
|
/static/
|
|
)
|
|
})
|
|
})
|