mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-03 22:59:14 +00:00
## Summary Major refactoring of browser tests to improve reliability, maintainability, and type safety. ## Changes ### Test Infrastructure Decomposition - Decomposed `ComfyPage.ts` (~1000 lines) into focused helpers: - `CanvasHelper`, `DebugHelper`, `SubgraphHelper`, `NodeOperationsHelper` - `SettingsHelper`, `WorkflowHelper`, `ClipboardHelper`, `KeyboardHelper` - Created `ContextMenu` page object, `BaseDialog` base class, and `BottomPanel` page object - Extracted `DefaultGraphPositions` constants ### Locator Stability - Added `data-testid` attributes to Vue components (sidebar, dialogs, node library) - Created centralized `selectors.ts` with test ID constants - Replaced fragile CSS selectors (`.nth()`, `:nth-child()`) with `getByTestId`/`getByRole` ### Performance & Reliability - Removed `setTimeout` anti-patterns (replaced with `waitForFunction`) - Replaced `waitForTimeout` with retrying assertions - Replaced hardcoded coordinates with computed `NodeReference` positions - Enforced LF line endings for all text files ### Type Safety - Enabled `no-explicit-any` lint rule for browser_tests via oxlint - Purged `as any` casts from browser_tests - Added Window type augmentation for standardized window access - Added proper type annotations throughout ### Bug Fixes - Restored `ExtensionManager` API contract - Removed test-only settings from production schema - Fixed flaky selectors and missing test setup ## Testing - All browser tests pass - Typecheck passes <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Tests** * Overhauled browser E2E test infrastructure with many new helpers/fixtures, updated test APIs, and CI test container image bumped for consistency. * **Chores** * Standardized line endings and applied stricter lint rules for browser tests; workspace dependency version updated. * **Documentation** * Updated Playwright and TypeScript testing guidance and test-run commands. * **UI** * Added stable data-testids to multiple components to improve testability. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
172 lines
5.9 KiB
TypeScript
172 lines
5.9 KiB
TypeScript
import type { ComfyPage } from '../fixtures/ComfyPage'
|
|
import {
|
|
comfyExpect as expect,
|
|
comfyPageFixture as test
|
|
} from '../fixtures/ComfyPage'
|
|
|
|
async function beforeChange(comfyPage: ComfyPage) {
|
|
await comfyPage.page.evaluate(() => {
|
|
window.app!.canvas!.emitBeforeChange()
|
|
})
|
|
}
|
|
async function afterChange(comfyPage: ComfyPage) {
|
|
await comfyPage.page.evaluate(() => {
|
|
window.app!.canvas!.emitAfterChange()
|
|
})
|
|
}
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
})
|
|
|
|
test.describe('Change Tracker', { tag: '@workflow' }, () => {
|
|
test.describe('Undo/Redo', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.workflow.setupWorkflowsDirectory({})
|
|
})
|
|
|
|
test('Can undo multiple operations', async ({ comfyPage }) => {
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
|
|
expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
|
|
|
|
// Save, confirm no errors & workflow modified flag removed
|
|
await comfyPage.menu.topbar.saveWorkflow('undo-redo-test')
|
|
expect(await comfyPage.toast.getToastErrorCount()).toBe(0)
|
|
expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
|
|
expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
|
|
|
|
const node = (await comfyPage.nodeOps.getFirstNodeRef())!
|
|
await node.click('title')
|
|
await node.click('collapse')
|
|
await expect(node).toBeCollapsed()
|
|
expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
|
|
expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
|
|
|
|
await comfyPage.keyboard.bypass()
|
|
await expect(node).toBeBypassed()
|
|
expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(2)
|
|
expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
|
|
|
|
await comfyPage.keyboard.undo()
|
|
await expect(node).not.toBeBypassed()
|
|
expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
|
|
expect(await comfyPage.workflow.getRedoQueueSize()).toBe(1)
|
|
|
|
await comfyPage.keyboard.undo()
|
|
await expect(node).not.toBeCollapsed()
|
|
expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
|
|
expect(await comfyPage.workflow.getRedoQueueSize()).toBe(2)
|
|
})
|
|
})
|
|
|
|
test('Can group multiple change actions into a single transaction', async ({
|
|
comfyPage
|
|
}) => {
|
|
const node = (await comfyPage.nodeOps.getFirstNodeRef())!
|
|
expect(node).toBeTruthy()
|
|
await expect(node).not.toBeCollapsed()
|
|
await expect(node).not.toBeBypassed()
|
|
|
|
// Make changes outside set
|
|
// Bypass + collapse node
|
|
await node.click('title')
|
|
await node.click('collapse')
|
|
await comfyPage.keyboard.bypass()
|
|
await expect(node).toBeCollapsed()
|
|
await expect(node).toBeBypassed()
|
|
|
|
// Undo, undo, ensure both changes undone
|
|
await comfyPage.keyboard.undo()
|
|
await expect(node).not.toBeBypassed()
|
|
await expect(node).toBeCollapsed()
|
|
await comfyPage.keyboard.undo()
|
|
await expect(node).not.toBeBypassed()
|
|
await expect(node).not.toBeCollapsed()
|
|
|
|
// Prevent clicks registering a double-click
|
|
await comfyPage.canvasOps.clickEmptySpace()
|
|
await node.click('title')
|
|
|
|
// Run again, but within a change transaction
|
|
await beforeChange(comfyPage)
|
|
|
|
await node.click('collapse')
|
|
await comfyPage.keyboard.bypass()
|
|
await expect(node).toBeCollapsed()
|
|
await expect(node).toBeBypassed()
|
|
|
|
// End transaction
|
|
await afterChange(comfyPage)
|
|
|
|
// Ensure undo reverts both changes
|
|
await comfyPage.keyboard.undo()
|
|
await expect(node).not.toBeBypassed()
|
|
await expect(node).not.toBeCollapsed()
|
|
})
|
|
|
|
test('Can nest multiple change transactions without adding undo steps', async ({
|
|
comfyPage
|
|
}) => {
|
|
const node = (await comfyPage.nodeOps.getFirstNodeRef())!
|
|
const bypassAndPin = async () => {
|
|
await beforeChange(comfyPage)
|
|
await comfyPage.keyboard.bypass()
|
|
await expect(node).toBeBypassed()
|
|
await comfyPage.page.keyboard.press('KeyP')
|
|
await comfyPage.nextFrame()
|
|
await expect(node).toBePinned()
|
|
await afterChange(comfyPage)
|
|
}
|
|
|
|
const collapse = async () => {
|
|
await beforeChange(comfyPage)
|
|
await node.click('collapse', { moveMouseToEmptyArea: true })
|
|
await expect(node).toBeCollapsed()
|
|
await afterChange(comfyPage)
|
|
}
|
|
|
|
const multipleChanges = async () => {
|
|
await beforeChange(comfyPage)
|
|
// Call other actions that uses begin/endChange
|
|
await node.click('title')
|
|
await collapse()
|
|
await bypassAndPin()
|
|
await afterChange(comfyPage)
|
|
}
|
|
|
|
await multipleChanges()
|
|
|
|
await comfyPage.keyboard.undo()
|
|
await expect(node).not.toBeBypassed()
|
|
await expect(node).not.toBePinned()
|
|
await expect(node).not.toBeCollapsed()
|
|
|
|
await comfyPage.keyboard.redo()
|
|
await expect(node).toBeBypassed()
|
|
await expect(node).toBePinned()
|
|
await expect(node).toBeCollapsed()
|
|
})
|
|
|
|
test('Can detect changes in workflow.extra', async ({ comfyPage }) => {
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
|
|
await comfyPage.page.evaluate(() => {
|
|
window.app!.graph!.extra.foo = 'bar'
|
|
})
|
|
// Click empty space to trigger a change detection.
|
|
await comfyPage.canvasOps.clickEmptySpace()
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
|
|
})
|
|
|
|
test('Ignores changes in workflow.ds', async ({ comfyPage }) => {
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
|
|
await comfyPage.canvasOps.pan({ x: 10, y: 10 })
|
|
expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
|
|
})
|
|
})
|