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>
211 lines
5.9 KiB
TypeScript
211 lines
5.9 KiB
TypeScript
/**
|
|
* Vue Node Test Helpers
|
|
*/
|
|
import type { Locator, Page } from '@playwright/test'
|
|
|
|
import { TestIds } from '@e2e/fixtures/selectors'
|
|
import { VueNodeFixture } from '@e2e/fixtures/utils/vueNodeFixtures'
|
|
|
|
export class VueNodeHelpers {
|
|
constructor(private page: Page) {}
|
|
|
|
/**
|
|
* Get locator for all Vue node components in the DOM
|
|
*/
|
|
get nodes(): Locator {
|
|
return this.page.locator('[data-node-id]')
|
|
}
|
|
|
|
/**
|
|
* Get locator for a Vue node by its NodeId
|
|
*/
|
|
getNodeLocator(nodeId: string): Locator {
|
|
return this.page.locator(`[data-node-id="${nodeId}"]`)
|
|
}
|
|
|
|
/**
|
|
* Get locator for selected Vue node components (using visual selection indicators)
|
|
*/
|
|
get selectedNodes(): Locator {
|
|
return this.page.locator('[data-node-id].outline-node-component-outline')
|
|
}
|
|
|
|
/**
|
|
* Get locator for Vue nodes by the node's title (displayed name in the header).
|
|
* Matches against the actual title element, not the full node body.
|
|
* Use `.first()` for unique titles, `.nth(n)` for duplicates.
|
|
*/
|
|
getNodeByTitle(title: string): Locator {
|
|
return this.page.locator('[data-node-id]').filter({
|
|
has: this.page.locator('[data-testid="node-title"]', { hasText: title })
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Get total count of Vue nodes in the DOM
|
|
*/
|
|
async getNodeCount(): Promise<number> {
|
|
return await this.nodes.count()
|
|
}
|
|
|
|
/**
|
|
* Get all Vue node IDs currently in the DOM
|
|
*/
|
|
async getNodeIds(): Promise<string[]> {
|
|
return await this.nodes.evaluateAll((nodes) =>
|
|
nodes
|
|
.map((n) => n.getAttribute('data-node-id'))
|
|
.filter((id): id is string => id !== null)
|
|
)
|
|
}
|
|
|
|
/**
|
|
* Select a specific Vue node by ID
|
|
*/
|
|
async selectNode(nodeId: string): Promise<void> {
|
|
await this.page
|
|
.locator(`[data-node-id="${nodeId}"] .lg-node-header`)
|
|
.click()
|
|
}
|
|
|
|
/**
|
|
* Select multiple Vue nodes by IDs using Ctrl+click
|
|
*/
|
|
async selectNodes(nodeIds: string[]): Promise<void> {
|
|
if (nodeIds.length === 0) return
|
|
|
|
// Select first node normally
|
|
await this.selectNode(nodeIds[0])
|
|
|
|
// Add additional nodes with Ctrl+click on header
|
|
for (let i = 1; i < nodeIds.length; i++) {
|
|
await this.page
|
|
.locator(`[data-node-id="${nodeIds[i]}"] .lg-node-header`)
|
|
.click({
|
|
modifiers: ['Control']
|
|
})
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Clear all selections by clicking empty space
|
|
*/
|
|
async clearSelection(): Promise<void> {
|
|
await this.page.mouse.click(50, 50)
|
|
}
|
|
|
|
/**
|
|
* Delete selected Vue nodes using Delete key
|
|
*/
|
|
async deleteSelected(): Promise<void> {
|
|
await this.page.locator('#graph-canvas').focus()
|
|
await this.page.keyboard.press('Delete')
|
|
}
|
|
|
|
/**
|
|
* Select a node by ID and delete it.
|
|
*/
|
|
async deleteNode(nodeId: string): Promise<void> {
|
|
await this.selectNode(nodeId)
|
|
await this.deleteSelected()
|
|
}
|
|
|
|
/**
|
|
* Delete selected Vue nodes using Backspace key
|
|
*/
|
|
async deleteSelectedWithBackspace(): Promise<void> {
|
|
await this.page.locator('#graph-canvas').focus()
|
|
await this.page.keyboard.press('Backspace')
|
|
}
|
|
|
|
/**
|
|
* Return a DOM-focused VueNodeFixture for the first node matching the title.
|
|
* Resolves the node id up front so subsequent interactions survive title changes.
|
|
*/
|
|
async getFixtureByTitle(title: string): Promise<VueNodeFixture> {
|
|
const node = this.getNodeByTitle(title).first()
|
|
await node.waitFor({ state: 'visible' })
|
|
|
|
const nodeId = await node.evaluate((el) => el.getAttribute('data-node-id'))
|
|
if (!nodeId) {
|
|
throw new Error(
|
|
`Vue node titled "${title}" is missing its data-node-id attribute`
|
|
)
|
|
}
|
|
|
|
return new VueNodeFixture(this.getNodeLocator(nodeId))
|
|
}
|
|
|
|
/**
|
|
* Wait for Vue nodes to be rendered
|
|
*/
|
|
async waitForNodes(expectedCount?: number): Promise<void> {
|
|
if (expectedCount !== undefined) {
|
|
await this.page.waitForFunction(
|
|
(count) => document.querySelectorAll('[data-node-id]').length >= count,
|
|
expectedCount
|
|
)
|
|
} else {
|
|
await this.page.waitForSelector('[data-node-id]')
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get a specific widget by node title and widget name
|
|
*/
|
|
getWidgetByName(nodeTitle: string, widgetName: string): Locator {
|
|
return this.getNodeByTitle(nodeTitle).getByLabel(widgetName, {
|
|
exact: true
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Select an option from a combo widget on a node.
|
|
*/
|
|
async selectComboOption(
|
|
nodeTitle: string,
|
|
widgetName: string,
|
|
optionName: string
|
|
): Promise<void> {
|
|
const node = this.getNodeByTitle(nodeTitle)
|
|
await node.getByRole('combobox', { name: widgetName, exact: true }).click()
|
|
await this.page
|
|
.getByRole('option', { name: optionName, exact: true })
|
|
.click()
|
|
}
|
|
|
|
/**
|
|
* Get controls for input number widgets (increment/decrement buttons and input)
|
|
*/
|
|
getInputNumberControls(widget: Locator) {
|
|
return {
|
|
input: widget.locator('input'),
|
|
decrementButton: widget.getByTestId(TestIds.widgets.decrement),
|
|
incrementButton: widget.getByTestId(TestIds.widgets.increment)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Enter the subgraph of a node.
|
|
* @param nodeId - The ID of the node to enter the subgraph of. If not provided, the first matched subgraph will be entered.
|
|
*/
|
|
async enterSubgraph(nodeId?: string): Promise<void> {
|
|
const locator = nodeId ? this.getNodeLocator(nodeId) : this.page
|
|
const editButton = locator.getByTestId(TestIds.widgets.subgraphEnterButton)
|
|
|
|
// The footer tab button extends below the node body (visible area),
|
|
// but its bounding box center overlaps the node body div.
|
|
// Click at the bottom 25% of the button which is the genuinely visible
|
|
// and unobstructed area outside the node body boundary.
|
|
const box = await editButton.boundingBox()
|
|
if (!box) {
|
|
throw new Error(
|
|
'subgraph-enter-button has no bounding box: element may be hidden or not in DOM'
|
|
)
|
|
}
|
|
await editButton.click({
|
|
position: { x: box.width / 2, y: box.height * 0.75 }
|
|
})
|
|
}
|
|
}
|