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>
373 lines
12 KiB
TypeScript
373 lines
12 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
|
|
test.describe('Remote COMBO Widget', { tag: '@widget' }, () => {
|
|
const mockOptions = ['d', 'c', 'b', 'a']
|
|
|
|
const addRemoteWidgetNode = async (
|
|
comfyPage: ComfyPage,
|
|
nodeName: string,
|
|
count: number = 1
|
|
) => {
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.open()
|
|
await tab.getFolder('DevTools').click()
|
|
const nodeEntry = tab.getNode(nodeName).first()
|
|
for (let i = 0; i < count; i++) {
|
|
await nodeEntry.click()
|
|
await comfyPage.nextFrame()
|
|
}
|
|
}
|
|
|
|
const getWidgetOptions = async (
|
|
comfyPage: ComfyPage,
|
|
nodeName: string
|
|
): Promise<string[] | undefined> => {
|
|
return await comfyPage.page.evaluate((name) => {
|
|
const node = window.app!.graph!.nodes.find((node) => node.title === name)
|
|
return node!.widgets![0].options.values as string[] | undefined
|
|
}, nodeName)
|
|
}
|
|
|
|
const getWidgetValue = async (comfyPage: ComfyPage, nodeName: string) => {
|
|
return await comfyPage.page.evaluate((name) => {
|
|
const node = window.app!.graph!.nodes.find((node) => node.title === name)
|
|
return node!.widgets![0].value
|
|
}, nodeName)
|
|
}
|
|
|
|
const clickRefreshButton = (comfyPage: ComfyPage, nodeName: string) => {
|
|
return comfyPage.page.evaluate((name) => {
|
|
const node = window.app!.graph!.nodes.find((node) => node.title === name)
|
|
const buttonWidget = node!.widgets!.find((w) => w.name === 'refresh')
|
|
return buttonWidget?.callback?.(buttonWidget.value)
|
|
}, nodeName)
|
|
}
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.NodeSearchBoxImpl',
|
|
'v1 (legacy)'
|
|
)
|
|
})
|
|
|
|
test.describe('Loading options', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route, request) => {
|
|
const params = new URL(request.url()).searchParams
|
|
const sort = params.get('sort')
|
|
await route.fulfill({
|
|
body: JSON.stringify(sort ? [...mockOptions].sort() : mockOptions),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
})
|
|
|
|
test.afterEach(async ({ comfyPage }) => {
|
|
await comfyPage.page.unroute('**/api/models/checkpoints**')
|
|
})
|
|
|
|
test('lazy loads options when widget is added from node library', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toEqual(mockOptions)
|
|
})
|
|
|
|
test('lazy loads options when widget is added via workflow load', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeName = 'Remote Widget Node'
|
|
await comfyPage.workflow.loadWorkflow('inputs/remote_widget')
|
|
|
|
await expect
|
|
.poll(() =>
|
|
comfyPage.page.evaluate((name) => {
|
|
return (
|
|
window.app!.graph!.nodes.find((node) => node.title === name) !=
|
|
null
|
|
)
|
|
}, nodeName)
|
|
)
|
|
.toBe(true)
|
|
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toEqual(mockOptions)
|
|
})
|
|
|
|
test('applies query parameters from input spec', async ({ comfyPage }) => {
|
|
const nodeName = 'Remote Widget Node With Sort Query Param'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toEqual([...mockOptions].sort())
|
|
})
|
|
|
|
test('handles empty list of options', async ({ comfyPage }) => {
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
await route.fulfill({ body: JSON.stringify([]), status: 200 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await expect.poll(() => getWidgetOptions(comfyPage, nodeName)).toEqual([])
|
|
})
|
|
|
|
test('falls back to default value when non-200 response', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
await route.fulfill({ status: 500 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toEqual('Loading...')
|
|
})
|
|
})
|
|
|
|
test.describe('Lazy Loading Behavior', () => {
|
|
test('does not fetch options before widget is added to graph', async ({
|
|
comfyPage
|
|
}) => {
|
|
let requestWasMade = false
|
|
|
|
comfyPage.page.on('request', (request) => {
|
|
if (request.url().includes('/api/models/checkpoints')) {
|
|
requestWasMade = true
|
|
}
|
|
})
|
|
|
|
expect(requestWasMade).toBe(false)
|
|
})
|
|
|
|
test('fetches options immediately after widget is added to graph', async ({
|
|
comfyPage
|
|
}) => {
|
|
const requestPromise = comfyPage.page.waitForRequest((request) =>
|
|
request.url().includes('/api/models/checkpoints')
|
|
)
|
|
await addRemoteWidgetNode(comfyPage, 'Remote Widget Node')
|
|
const request = await requestPromise
|
|
expect(request.url()).toContain('/api/models/checkpoints')
|
|
})
|
|
})
|
|
|
|
test.describe('Refresh Behavior', () => {
|
|
test('refresh button is visible in selection toolbar when node is selected', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
|
|
// Select remote widget node
|
|
await comfyPage.page.keyboard.press('Control+A')
|
|
|
|
await expect(
|
|
comfyPage.page.locator(
|
|
'.selection-toolbox button[data-testid="refresh-button"]'
|
|
)
|
|
).toBeVisible()
|
|
})
|
|
|
|
test('refreshes options when TTL expires', async ({ comfyPage }) => {
|
|
// Fulfill each request with a unique timestamp
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route, _request) => {
|
|
await route.fulfill({
|
|
body: JSON.stringify([Date.now()]),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node With 300ms Refresh'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
// Wait for initial options to load before capturing baseline
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toBeTruthy()
|
|
const initialOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
|
|
// Click on the canvas to trigger widget refresh
|
|
await comfyPage.page.mouse.click(400, 300)
|
|
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.not.toEqual(initialOptions)
|
|
})
|
|
|
|
test('does not refresh when TTL is not set', async ({ comfyPage }) => {
|
|
let requestCount = 0
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
requestCount++
|
|
await route.fulfill({ body: JSON.stringify(['test']), status: 200 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
// Wait for initial fetch to complete
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toEqual(['test'])
|
|
|
|
// Force multiple re-renders
|
|
for (let i = 0; i < 3; i++) {
|
|
await comfyPage.page.mouse.click(100, 100)
|
|
await comfyPage.nextFrame()
|
|
}
|
|
|
|
await expect.poll(() => requestCount, { timeout: 1000 }).toBe(1) // Should only make initial request
|
|
})
|
|
|
|
test('retries failed requests with backoff', async ({ comfyPage }) => {
|
|
const timestamps: number[] = []
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
timestamps.push(Date.now())
|
|
await route.fulfill({ status: 500 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
|
|
// Initial canvas click to trigger widget render
|
|
await comfyPage.page.mouse.click(400, 300)
|
|
|
|
// Drive canvas redraws to let the retry scheduler fire
|
|
await expect(async () => {
|
|
await comfyPage.page.mouse.click(400, 300)
|
|
await comfyPage.nextFrame()
|
|
expect(timestamps.length).toBeGreaterThanOrEqual(3)
|
|
}).toPass({ timeout: 15000, intervals: [500, 1000, 1500] })
|
|
|
|
// Verify backoff: last interval should exceed first
|
|
const intervals = timestamps.slice(1).map((t, i) => t - timestamps[i])
|
|
expect(intervals[intervals.length - 1]).toBeGreaterThan(intervals[0])
|
|
})
|
|
|
|
test('clicking refresh button forces a refresh', async ({ comfyPage }) => {
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
await route.fulfill({
|
|
body: JSON.stringify([`${Date.now()}`]),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node With Refresh Button'
|
|
|
|
// Trigger initial fetch when adding node to the graph
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
// Wait for initial options to load before capturing baseline
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toBeTruthy()
|
|
const initialOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
|
|
// Click refresh button
|
|
await clickRefreshButton(comfyPage, nodeName)
|
|
|
|
// Verify refresh occurred
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.not.toEqual(initialOptions)
|
|
})
|
|
|
|
test('control_after_refresh is applied after refresh', async ({
|
|
comfyPage
|
|
}) => {
|
|
const options = [
|
|
['first option', 'second option', 'third option'],
|
|
['new first option', 'first option', 'second option', 'third option']
|
|
]
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
const next = options.shift()
|
|
await route.fulfill({
|
|
body: JSON.stringify(next),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
const nodeName =
|
|
'Remote Widget Node With Refresh Button and Control After Refresh'
|
|
|
|
// Trigger initial fetch when adding node to the graph
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
// Wait for initial options to load
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toBeTruthy()
|
|
|
|
// Click refresh button
|
|
await clickRefreshButton(comfyPage, nodeName)
|
|
|
|
// Verify the selected value of the widget is the first option in the refreshed list
|
|
await expect
|
|
.poll(() => getWidgetValue(comfyPage, nodeName))
|
|
.toEqual('new first option')
|
|
})
|
|
})
|
|
|
|
test.describe('Cache Behavior', () => {
|
|
test('reuses cached data between widgets with same params', async ({
|
|
comfyPage
|
|
}) => {
|
|
let requestCount = 0
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
requestCount++
|
|
await route.fulfill({
|
|
body: JSON.stringify(mockOptions),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
// Add two widgets with same config
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName, 2)
|
|
// Wait for options to be populated before checking request count
|
|
await expect
|
|
.poll(() => getWidgetOptions(comfyPage, nodeName))
|
|
.toEqual(mockOptions)
|
|
|
|
await expect.poll(() => requestCount, { timeout: 1000 }).toBe(1) // Should reuse cached data
|
|
})
|
|
})
|
|
})
|