mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +00:00
## Summary
Enable the previously disabled `playwright/no-force-option` lint rule at
error level and resolve all 29 violations across 10 files.
## Changes
### Lint rule
- `.oxlintrc.json`: `playwright/no-force-option` changed from `off` to
`error`
### Shared utility
- `CanvasHelper.ts`: Add `mouseClickAt()` and `mouseDblclickAt()`
methods that convert canvas-element-relative positions to absolute page
coordinates and use `page.mouse` APIs, avoiding Playwright's locator
actionability checks that fail when Vue DOM overlays sit above the
`<canvas>` element
### Force removal (20 violations)
- `selectionToolboxActions.spec.ts`: Remove `force: true` from 8 toolbox
button clicks (the `pointer-events: none` splitter overlay does not
intercept `elementFromPoint()`)
- `selectionToolboxSubmenus.spec.ts`: Remove `force: true` from 2
popover menu item clicks
- `BuilderSelectHelper.ts`: Remove `force: true` from 2 widget/node
clicks (builder mode does not disable pointer events)
- `linkInteraction.spec.ts`: Remove `force: true` from 3 slot `dragTo()`
calls (`::after` pseudo-elements do not intercept `elementFromPoint()`)
- `SidebarTab.ts`: Remove `force: true` from toast dismissal (`.catch()`
already handles failures)
- `nodeHelp.spec.ts`: Remove `force: true` from info button click
(preceding `toBeVisible()` assertion is sufficient)
### Rewrites (3 violations)
- `integerWidget.spec.ts`: Replace force-clicking disabled buttons with
`toBeDisabled()` assertions
- `Topbar.ts`: Replace force-click with `waitFor({ state: 'visible' })`
after hover
### Canvas coordinate clicks (9 violations)
- `litegraphUtils.ts`: Convert `NodeReference.click()` and
`navigateIntoSubgraph()` to use
`canvasOps.mouseClickAt()`/`mouseDblclickAt()`
- `subgraphPromotion.spec.ts`: Convert 3 right-click canvas calls to
`canvasOps.mouseClickAt()`
- `selectionToolboxSubmenus.spec.ts`: Convert 1 canvas dismiss-click to
`canvasOps.mouseClickAt()`
## Rationale
The original `force: true` usages were added defensively based on
incorrect assumptions about the `z-999 pointer-events: none` splitter
overlay intercepting Playwright's actionability checks. In reality,
`elementFromPoint()` skips elements with `pointer-events: none`, so the
overlay is transparent to Playwright's hit-test.
For canvas coordinate clicks, `force: true` on a locator does not tunnel
through DOM overlays — it only skips Playwright's preflight checks.
`page.mouse.click()` is the correct API for coordinate-based canvas
interactions.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-11164-fix-enable-playwright-no-force-option-lint-rule-33f6d73d365081e78601c6114121d272)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Amp <amp@ampcode.com>
190 lines
5.9 KiB
TypeScript
190 lines
5.9 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
})
|
|
|
|
test.describe(
|
|
'Selection Toolbox - More Options Submenus',
|
|
{ tag: '@ui' },
|
|
() => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
|
|
await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.nodeOps.selectNodes(['KSampler'])
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
const openMoreOptions = async (comfyPage: ComfyPage) => {
|
|
const ksamplerNodes =
|
|
await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
|
|
if (ksamplerNodes.length === 0) {
|
|
throw new Error('No KSampler nodes found')
|
|
}
|
|
|
|
// Drag the KSampler to the center of the screen
|
|
const nodePos = await ksamplerNodes[0].getPosition()
|
|
const viewportSize = comfyPage.page.viewportSize()
|
|
if (!viewportSize) {
|
|
throw new Error(
|
|
'Viewport size is null - page may not be properly initialized'
|
|
)
|
|
}
|
|
const centerX = viewportSize.width / 3
|
|
const centerY = viewportSize.height / 2
|
|
await comfyPage.canvasOps.dragAndDrop(
|
|
{ x: nodePos.x, y: nodePos.y },
|
|
{ x: centerX, y: centerY }
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
await ksamplerNodes[0].click('title')
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible()
|
|
|
|
const moreOptionsBtn = comfyPage.page.getByTestId('more-options-button')
|
|
await expect(moreOptionsBtn).toBeVisible()
|
|
|
|
await moreOptionsBtn.click()
|
|
|
|
await comfyPage.nextFrame()
|
|
|
|
const menuOptionsVisible = await comfyPage.page
|
|
.getByText('Rename')
|
|
.isVisible({ timeout: 2000 })
|
|
.catch(() => false)
|
|
if (menuOptionsVisible) {
|
|
return
|
|
}
|
|
|
|
await moreOptionsBtn.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
const menuOptionsVisibleAfterClick = await comfyPage.page
|
|
.getByText('Rename')
|
|
.isVisible({ timeout: 2000 })
|
|
.catch(() => false)
|
|
if (menuOptionsVisibleAfterClick) {
|
|
return
|
|
}
|
|
|
|
throw new Error('Could not open More Options menu - popover not showing')
|
|
}
|
|
|
|
test('opens Node Info from More Options menu', async ({ comfyPage }) => {
|
|
await openMoreOptions(comfyPage)
|
|
const nodeInfoButton = comfyPage.page.getByText('Node Info', {
|
|
exact: true
|
|
})
|
|
await expect(nodeInfoButton).toBeVisible()
|
|
await nodeInfoButton.click()
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
test('changes node shape via Shape submenu', async ({ comfyPage }) => {
|
|
const nodeRef = (
|
|
await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
|
|
)[0]
|
|
|
|
await openMoreOptions(comfyPage)
|
|
await comfyPage.page.getByText('Shape', { exact: true }).hover()
|
|
await expect(
|
|
comfyPage.page.getByText('Box', { exact: true })
|
|
).toBeVisible()
|
|
await comfyPage.page.getByText('Box', { exact: true }).click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect.poll(() => nodeRef.getProperty<number>('shape')).toBe(1)
|
|
})
|
|
|
|
test('changes node color via Color submenu swatch', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeRef = (
|
|
await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
|
|
)[0]
|
|
|
|
await openMoreOptions(comfyPage)
|
|
await comfyPage.page.getByText('Color', { exact: true }).click()
|
|
const blueSwatch = comfyPage.page.getByTitle('Blue')
|
|
await expect(blueSwatch.first()).toBeVisible()
|
|
await blueSwatch.first().click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() => nodeRef.getProperty<string | undefined>('color'))
|
|
.toBe('#223')
|
|
})
|
|
|
|
test('renames a node using Rename action', async ({ comfyPage }) => {
|
|
const nodeRef = (
|
|
await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
|
|
)[0]
|
|
await openMoreOptions(comfyPage)
|
|
await comfyPage.page.getByText('Rename', { exact: true }).click()
|
|
const input = comfyPage.page.locator(
|
|
'.group-title-editor.node-title-editor .editable-text input'
|
|
)
|
|
await expect(input).toBeVisible()
|
|
await input.fill('RenamedNode')
|
|
await input.press('Enter')
|
|
await comfyPage.nextFrame()
|
|
await expect
|
|
.poll(() => nodeRef.getProperty<string>('title'))
|
|
.toBe('RenamedNode')
|
|
})
|
|
|
|
test('closes More Options menu when clicking outside', async ({
|
|
comfyPage
|
|
}) => {
|
|
await openMoreOptions(comfyPage)
|
|
const renameItem = comfyPage.page.getByText('Rename', { exact: true })
|
|
await expect(renameItem).toBeVisible()
|
|
|
|
// Wait for multiple frames to allow PrimeVue's outside click handler to initialize
|
|
for (let i = 0; i < 30; i++) {
|
|
await comfyPage.nextFrame()
|
|
}
|
|
|
|
await comfyPage.canvasOps.mouseClickAt({ x: 0, y: 50 })
|
|
await expect(
|
|
comfyPage.page.getByText('Rename', { exact: true })
|
|
).toBeHidden()
|
|
})
|
|
|
|
test('closes More Options menu when clicking the button again (toggle)', async ({
|
|
comfyPage
|
|
}) => {
|
|
await openMoreOptions(comfyPage)
|
|
await expect(
|
|
comfyPage.page.getByText('Rename', { exact: true })
|
|
).toBeVisible()
|
|
|
|
await comfyPage.page.evaluate(() => {
|
|
const btn = document.querySelector(
|
|
'[data-testid="more-options-button"]'
|
|
)
|
|
if (btn) {
|
|
const event = new MouseEvent('click', {
|
|
bubbles: true,
|
|
cancelable: true,
|
|
view: window,
|
|
detail: 1
|
|
})
|
|
btn.dispatchEvent(event)
|
|
}
|
|
})
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(
|
|
comfyPage.page.getByText('Rename', { exact: true })
|
|
).toBeHidden()
|
|
})
|
|
}
|
|
)
|