mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +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>
152 lines
4.6 KiB
TypeScript
152 lines
4.6 KiB
TypeScript
import type { Locator } from '@playwright/test'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import {
|
|
comfyPageFixture as test,
|
|
comfyExpect as expect
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
import { TestIds } from '@e2e/fixtures/selectors'
|
|
|
|
async function ensurePropertiesPanel(comfyPage: ComfyPage) {
|
|
const panel = comfyPage.menu.propertiesPanel.root
|
|
if (!(await panel.isVisible())) {
|
|
await comfyPage.actionbar.propertiesButton.click()
|
|
}
|
|
await expect(panel).toBeVisible()
|
|
return panel
|
|
}
|
|
|
|
async function selectSubgraphAndOpenEditor(
|
|
comfyPage: ComfyPage,
|
|
nodeTitle: string
|
|
) {
|
|
const subgraphNodes = await comfyPage.nodeOps.getNodeRefsByTitle(nodeTitle)
|
|
expect(subgraphNodes.length).toBeGreaterThan(0)
|
|
await subgraphNodes[0].click('title')
|
|
|
|
await ensurePropertiesPanel(comfyPage)
|
|
|
|
const editorToggle = comfyPage.page.getByTestId(TestIds.subgraphEditor.toggle)
|
|
await expect(editorToggle).toBeVisible()
|
|
await editorToggle.click()
|
|
|
|
const shownSection = comfyPage.page.getByTestId(
|
|
TestIds.subgraphEditor.shownSection
|
|
)
|
|
await expect(shownSection).toBeVisible()
|
|
return shownSection
|
|
}
|
|
|
|
async function collectWidgetLabels(shownSection: Locator) {
|
|
const labels = shownSection.getByTestId(TestIds.subgraphEditor.widgetLabel)
|
|
const texts = await labels.allTextContents()
|
|
return texts.map((t) => t.trim())
|
|
}
|
|
|
|
test.describe(
|
|
'Subgraph promoted widget panel',
|
|
{ tag: ['@node', '@widget'] },
|
|
() => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
test.describe('SubgraphEditor (Settings panel)', () => {
|
|
test('linked promoted widgets have hide toggle disabled', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-nested-promotion'
|
|
)
|
|
const shownSection = await selectSubgraphAndOpenEditor(
|
|
comfyPage,
|
|
'Sub 0'
|
|
)
|
|
|
|
const toggleButtons = shownSection.getByTestId(
|
|
TestIds.subgraphEditor.widgetToggle
|
|
)
|
|
await expect(toggleButtons.first()).toBeVisible()
|
|
|
|
const count = await toggleButtons.count()
|
|
for (let i = 0; i < count; i++) {
|
|
await expect(toggleButtons.nth(i)).toBeDisabled()
|
|
}
|
|
})
|
|
|
|
test('linked promoted widgets show link icon instead of eye icon', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-nested-promotion'
|
|
)
|
|
const shownSection = await selectSubgraphAndOpenEditor(
|
|
comfyPage,
|
|
'Sub 0'
|
|
)
|
|
|
|
const linkIcons = shownSection.getByTestId(
|
|
TestIds.subgraphEditor.iconLink
|
|
)
|
|
await expect(linkIcons.first()).toBeVisible()
|
|
|
|
const eyeIcons = shownSection.getByTestId(
|
|
TestIds.subgraphEditor.iconEye
|
|
)
|
|
await expect(eyeIcons).toHaveCount(0)
|
|
})
|
|
|
|
test('widget labels display renamed values instead of raw names', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/test-values-input-subgraph'
|
|
)
|
|
const shownSection = await selectSubgraphAndOpenEditor(
|
|
comfyPage,
|
|
'Input Test Subgraph'
|
|
)
|
|
|
|
await expect
|
|
.poll(() => collectWidgetLabels(shownSection))
|
|
.toEqual(
|
|
expect.arrayContaining([
|
|
expect.anything(),
|
|
'renamed_from_sidepanel'
|
|
])
|
|
)
|
|
await expect
|
|
.poll(() => collectWidgetLabels(shownSection))
|
|
.not.toContain('text')
|
|
})
|
|
})
|
|
|
|
test.describe('Parameters tab (WidgetActions menu)', () => {
|
|
test('linked promoted widget menu should not show Hide/Show input', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-nested-promotion'
|
|
)
|
|
const subgraphNodes =
|
|
await comfyPage.nodeOps.getNodeRefsByTitle('Sub 0')
|
|
expect(subgraphNodes.length).toBeGreaterThan(0)
|
|
await subgraphNodes[0].click('title')
|
|
|
|
const panel = await ensurePropertiesPanel(comfyPage)
|
|
|
|
const moreButtons = panel.getByTestId(
|
|
TestIds.subgraphEditor.widgetActionsMenuButton
|
|
)
|
|
await expect(moreButtons.first()).toBeVisible()
|
|
await moreButtons.first().click()
|
|
|
|
const menu = comfyPage.page.getByTestId(TestIds.menu.moreMenuContent)
|
|
await expect(menu).toBeVisible()
|
|
await expect(menu.getByText('Hide input')).toHaveCount(0)
|
|
await expect(menu.getByText('Show input')).toHaveCount(0)
|
|
await expect(menu.getByText('Rename')).toBeVisible()
|
|
})
|
|
})
|
|
}
|
|
)
|