mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-24 06:35:10 +00:00
## Summary
Internalize `nextFrame()` calls into fixture/helper methods so spec
authors don't need to remember to call it after common operations.
`nextFrame()` waits for one `requestAnimationFrame` (~16ms) — an extra
call is always safe, making this a low-risk refactor.
## Changes
### Phase 1: `SettingsHelper.setSetting()`
`setSetting()` now calls `nextFrame()` internally. Removed 15 redundant
calls across 7 files.
### Phase 2: `CommandHelper.executeCommand()`
`executeCommand()` now calls `nextFrame()` internally. Removed 15
redundant calls across 7 files, including the now-redundant call in
`AppModeHelper.toggleAppMode()`.
### Phase 3: `WorkflowHelper.loadGraphData()`
New helper wraps `page.evaluate(loadGraphData)` + `nextFrame()`.
Migrated `SubgraphHelper.serializeAndReload()` and `groupNode.spec.ts`.
### Phase 4: `NodeReference` cleanup
Removed redundant `nextFrame()` from `copy()`, `convertToGroupNode()`,
`resizeNode()`, `dragTextEncodeNode2()`, and
`convertDefaultKSamplerToSubgraph()`. Removed 6 spec-level calls after
`node.click('title')`.
### Phase 5: `KeyboardHelper.press()` and `delete()`
New convenience methods that press a key and wait one frame. Converted
40 `canvas.press(key)` + `nextFrame()` pairs across 13 spec files.
### Phase 6: `ComfyPage.expectScreenshot()`
New helper combines `nextFrame()` + `toHaveScreenshot()`. Converted 45
pairs across 12 spec files.
## Total impact
- **~130 redundant `nextFrame()` calls eliminated** across ~35
spec/helper files
- **3 new helper methods** added (`loadGraphData`, `press`/`delete`,
`expectScreenshot`)
- **2 existing methods** enhanced (`setSetting`, `executeCommand`)
## What was NOT changed
- `performance.spec.ts` frame-counting loops (intentional)
- `ComfyMouse.ts` / `CanvasHelper.ts` (already internalized)
- `SubgraphHelper.packAllInteriorNodes()` (deliberate orchestration)
- Builder helpers (already internalized)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-11166-refactor-internalize-nextFrame-into-fixture-helper-methods-33f6d73d3650817bb5f6fb46e396085e)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Amp <amp@ampcode.com>
200 lines
5.9 KiB
TypeScript
200 lines
5.9 KiB
TypeScript
import {
|
|
comfyPageFixture as test,
|
|
comfyExpect as expect
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import {
|
|
builderSaveAs,
|
|
openWorkflowFromSidebar,
|
|
setupBuilder
|
|
} from '@e2e/helpers/builderTestUtils'
|
|
|
|
const WIDGETS = ['seed', 'steps', 'cfg']
|
|
|
|
/** Save as app, close it by loading default, reopen from sidebar, enter app mode. */
|
|
async function saveCloseAndReopenAsApp(
|
|
comfyPage: ComfyPage,
|
|
appMode: AppModeHelper,
|
|
workflowName: string
|
|
) {
|
|
await appMode.steps.goToPreview()
|
|
await builderSaveAs(appMode, workflowName)
|
|
await appMode.saveAs.closeButton.click()
|
|
await expect(appMode.saveAs.successDialog).toBeHidden()
|
|
|
|
await appMode.footer.exitBuilder()
|
|
await openWorkflowFromSidebar(comfyPage, workflowName)
|
|
await appMode.toggleAppMode()
|
|
}
|
|
|
|
test.describe('Builder input reordering', { tag: '@ui' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.appMode.enableLinearMode()
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.AppBuilder.VueNodeSwitchDismissed',
|
|
true
|
|
)
|
|
})
|
|
|
|
test('Drag first input to last position', async ({ comfyPage }) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(0, 2)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
})
|
|
|
|
test('Drag last input to first position', async ({ comfyPage }) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(2, 0)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'cfg',
|
|
'seed',
|
|
'steps'
|
|
])
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'cfg',
|
|
'seed',
|
|
'steps'
|
|
])
|
|
})
|
|
|
|
test('Drag input to middle position', async ({ comfyPage }) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(0, 1)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'steps',
|
|
'seed',
|
|
'cfg'
|
|
])
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'seed',
|
|
'cfg'
|
|
])
|
|
})
|
|
|
|
test('Reorder in preview step reflects in app mode after save', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragPreviewItem(0, 2)
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
|
|
const workflowName = `${Date.now()} reorder-preview`
|
|
await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
|
|
|
|
await expect(appMode.linearWidgets).toBeVisible()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
})
|
|
|
|
test('Reorder inputs persists after save and reload', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await appMode.select.dragInputItem(0, 2)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
|
|
const workflowName = `${Date.now()} reorder-persist`
|
|
await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
|
|
|
|
await expect(appMode.linearWidgets).toBeVisible()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
})
|
|
|
|
test('Reordering inputs in one app does not corrupt another app', async ({
|
|
comfyPage
|
|
}, testInfo) => {
|
|
// This test creates 2 apps, switches tabs 3 times, and enters builder 3
|
|
// times — the default 15s timeout is insufficient in CI.
|
|
testInfo.setTimeout(45_000)
|
|
const { appMode } = comfyPage
|
|
const app2Widgets = ['seed', 'steps']
|
|
const app1Reordered = ['steps', 'cfg', 'seed']
|
|
|
|
await test.step('Load both apps', async () => {
|
|
await comfyPage.workflow.loadWorkflow('linear-basic-app-1')
|
|
await comfyPage.workflow.loadWorkflow('linear-basic-app-2')
|
|
})
|
|
|
|
await test.step('Reorder app1 inputs', async () => {
|
|
await comfyPage.workflow.switchToTab('linear-basic-app-1')
|
|
await appMode.enterBuilder()
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(0, 2)
|
|
await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
|
|
})
|
|
|
|
await test.step('Verify app2 inputs are not corrupted', async () => {
|
|
await appMode.footer.exitBuilder()
|
|
await comfyPage.workflow.switchToTab('linear-basic-app-2')
|
|
await appMode.enterBuilder()
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(app2Widgets)
|
|
})
|
|
|
|
await test.step('Verify app1 reorder persisted', async () => {
|
|
await appMode.footer.exitBuilder()
|
|
await comfyPage.workflow.switchToTab('linear-basic-app-1')
|
|
await appMode.enterBuilder()
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
|
|
})
|
|
})
|
|
})
|