mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## Summary From the primordial entropy of 17 scattered spec files — a formless sprawl of mixed concerns and inconsistent naming — emerges a clean, domain-organized hierarchy. Order triumphs over chaos. ## Changes - **What**: Reorganize all subgraph E2E tests from 17 flat files in `browser_tests/tests/` into 10 domain-grouped files under `browser_tests/tests/subgraph/`. | File | Tests | Domain | |------|-------|--------| | `subgraphSlots` | 16 | I/O slot CRUD, rename, alignment, promoted slot position | | `subgraphPromotion` | 22 | Auto-promote, visibility, reactivity, context menu, cleanup | | `subgraphSerialization` | 16 | Hydration, round-trip, legacy formats, ID remapping | | `subgraphNavigation` | 10 | Breadcrumb, viewport, hotkeys, progress state | | `subgraphNested` | 9 | Configure order, duplicate names, pack values, stale proxies | | `subgraphLifecycle` | 7 | Source removal cleanup, pseudo-preview lifecycle | | `subgraphPromotionDom` | 6 | DOM widget persistence, cleanup, positioning | | `subgraphCrud` | 5 | Create, delete, copy, unpack | | `subgraphSearch` | 3 | Search aliases, description, persistence | | `subgraphOperations` | 2 | Copy/paste inside, undo/redo inside | Where once the monolith `subgraph.spec.ts` (856 lines) mixed slot CRUD with hotkeys, DOM widgets with navigation, and copy/paste with undo/redo — now each behavioral domain has its sovereign territory. Where once `subgraph-rename-dialog.spec.ts`, `subgraphInputSlotRename.spec.ts`, and `subgraph-promoted-slot-position.spec.ts` scattered rename concerns across three kingdoms — now they answer to one crown: `subgraphSlots.spec.ts`. Where once `kebab-case` and `camelCase` warred for dominion — now a single convention reigns. All 96 test cases preserved. Zero test logic changes. Purely structural. ## Review Focus - Verify no tests were lost in the consolidation - Confirm import paths all resolve correctly at the new depth (`../../fixtures/`) - The `import.meta.dirname` asset path in `subgraphSlots.spec.ts` (slot alignment test) updated for new directory depth ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-10695-test-reorganize-subgraph-E2E-tests-into-domain-organized-directory-3326d73d36508197939be8825b69ea88) by [Unito](https://www.unito.io) Co-authored-by: Amp <amp@ampcode.com>
217 lines
7.2 KiB
TypeScript
217 lines
7.2 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
|
|
import { SubgraphHelper } from '../../fixtures/helpers/SubgraphHelper'
|
|
import { getPromotedWidgetNames } from '../../helpers/promotedWidgets'
|
|
|
|
// Constants
|
|
const TEST_WIDGET_CONTENT = 'Test content that should persist'
|
|
|
|
// Common selectors
|
|
const SELECTORS = {
|
|
breadcrumb: '.subgraph-breadcrumb',
|
|
domWidget: '.comfy-multiline-input'
|
|
} as const
|
|
|
|
test.describe(
|
|
'Subgraph Promoted Widget DOM',
|
|
{ tag: ['@slow', '@subgraph'] },
|
|
() => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.NodeSearchBoxImpl',
|
|
'v1 (legacy)'
|
|
)
|
|
})
|
|
|
|
test.describe('DOM Widget Navigation and Persistence', () => {
|
|
test('DOM widget visibility persists through subgraph navigation', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-with-promoted-text-widget'
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
// Verify promoted widget is visible in parent graph
|
|
const parentTextarea = comfyPage.page.locator(SELECTORS.domWidget)
|
|
await expect(parentTextarea).toBeVisible()
|
|
await expect(parentTextarea).toHaveCount(1)
|
|
|
|
const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
|
|
expect(await subgraphNode.exists()).toBe(true)
|
|
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
|
|
// Verify widget is visible in subgraph
|
|
const subgraphTextarea = comfyPage.page.locator(SELECTORS.domWidget)
|
|
await expect(subgraphTextarea).toBeVisible()
|
|
await expect(subgraphTextarea).toHaveCount(1)
|
|
|
|
// Navigate back
|
|
await comfyPage.page.keyboard.press('Escape')
|
|
await comfyPage.nextFrame()
|
|
|
|
// Verify widget is still visible
|
|
const backToParentTextarea = comfyPage.page.locator(SELECTORS.domWidget)
|
|
await expect(backToParentTextarea).toBeVisible()
|
|
await expect(backToParentTextarea).toHaveCount(1)
|
|
})
|
|
|
|
test('DOM widget content is preserved through navigation', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-with-promoted-text-widget'
|
|
)
|
|
|
|
const textarea = comfyPage.page.locator(SELECTORS.domWidget)
|
|
await textarea.fill(TEST_WIDGET_CONTENT)
|
|
|
|
const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
|
|
const subgraphTextarea = comfyPage.page.locator(SELECTORS.domWidget)
|
|
await expect(subgraphTextarea).toHaveValue(TEST_WIDGET_CONTENT)
|
|
|
|
await comfyPage.page.keyboard.press('Escape')
|
|
await comfyPage.nextFrame()
|
|
|
|
const parentTextarea = comfyPage.page.locator(SELECTORS.domWidget)
|
|
await expect(parentTextarea).toHaveValue(TEST_WIDGET_CONTENT)
|
|
})
|
|
|
|
test('Multiple promoted widgets are handled correctly', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-with-multiple-promoted-widgets'
|
|
)
|
|
|
|
const parentCount = await comfyPage.page
|
|
.locator(SELECTORS.domWidget)
|
|
.count()
|
|
expect(parentCount).toBeGreaterThan(1)
|
|
|
|
const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
|
|
const subgraphCount = await comfyPage.page
|
|
.locator(SELECTORS.domWidget)
|
|
.count()
|
|
expect(subgraphCount).toBe(parentCount)
|
|
|
|
await comfyPage.page.keyboard.press('Escape')
|
|
await comfyPage.nextFrame()
|
|
|
|
const finalCount = await comfyPage.page
|
|
.locator(SELECTORS.domWidget)
|
|
.count()
|
|
expect(finalCount).toBe(parentCount)
|
|
})
|
|
})
|
|
|
|
test.describe('DOM Cleanup', () => {
|
|
test('DOM elements are cleaned up when subgraph node is removed', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow(
|
|
'subgraphs/subgraph-with-promoted-text-widget'
|
|
)
|
|
|
|
const initialCount = await comfyPage.page
|
|
.locator(SELECTORS.domWidget)
|
|
.count()
|
|
expect(initialCount).toBe(1)
|
|
|
|
const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
|
|
|
|
await subgraphNode.delete()
|
|
|
|
const finalCount = await comfyPage.page
|
|
.locator(SELECTORS.domWidget)
|
|
.count()
|
|
expect(finalCount).toBe(0)
|
|
})
|
|
|
|
test('DOM elements are cleaned up when widget is disconnected from I/O', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Enable new menu for breadcrumb navigation
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
|
|
const workflowName = 'subgraphs/subgraph-with-promoted-text-widget'
|
|
await comfyPage.workflow.loadWorkflow(workflowName)
|
|
|
|
const textareaCount = await comfyPage.page
|
|
.locator(SELECTORS.domWidget)
|
|
.count()
|
|
expect(textareaCount).toBe(1)
|
|
|
|
const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
|
|
|
|
// Navigate into subgraph (method now handles retries internally)
|
|
await subgraphNode.navigateIntoSubgraph()
|
|
|
|
await comfyPage.subgraph.removeSlot('input', 'text')
|
|
|
|
// Wait for breadcrumb to be visible
|
|
await comfyPage.page.waitForSelector(SELECTORS.breadcrumb, {
|
|
state: 'visible',
|
|
timeout: 5000
|
|
})
|
|
|
|
// Click breadcrumb to navigate back to parent graph
|
|
const homeBreadcrumb = comfyPage.page.locator(
|
|
'.p-breadcrumb-list > :first-child'
|
|
)
|
|
await homeBreadcrumb.waitFor({ state: 'visible' })
|
|
await homeBreadcrumb.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
// Check that the subgraph node has no widgets after removing the text slot
|
|
const widgetCount = await comfyPage.page.evaluate(() => {
|
|
return window.app!.canvas.graph!.nodes[0].widgets?.length || 0
|
|
})
|
|
|
|
expect(widgetCount).toBe(0)
|
|
})
|
|
})
|
|
|
|
test.describe('DOM Positioning', () => {
|
|
test('Promoted seed widget renders in node body, not header', async ({
|
|
comfyPage
|
|
}) => {
|
|
const subgraphNode =
|
|
await comfyPage.subgraph.convertDefaultKSamplerToSubgraph()
|
|
|
|
// Enable Vue nodes now that the subgraph has been created
|
|
await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
|
|
|
|
const subgraphNodeId = String(subgraphNode.id)
|
|
const promotedNames = await getPromotedWidgetNames(
|
|
comfyPage,
|
|
subgraphNodeId
|
|
)
|
|
expect(promotedNames).toContain('seed')
|
|
|
|
// Wait for Vue nodes to render
|
|
await comfyPage.vueNodes.waitForNodes()
|
|
|
|
const nodeLocator = comfyPage.vueNodes.getNodeLocator(subgraphNodeId)
|
|
await expect(nodeLocator).toBeVisible()
|
|
|
|
// The seed widget should be visible inside the node body
|
|
const seedWidget = nodeLocator
|
|
.getByLabel('seed', { exact: true })
|
|
.first()
|
|
await expect(seedWidget).toBeVisible()
|
|
|
|
// Verify widget is inside the node body, not the header
|
|
await SubgraphHelper.expectWidgetBelowHeader(nodeLocator, seedWidget)
|
|
})
|
|
})
|
|
}
|
|
)
|