mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-21 21:09:00 +00:00
*PR Created by the Glary-Bot Agent* --- ## Summary - Eliminates the confusing dual-helpers structure where `browser_tests/helpers/` and `browser_tests/fixtures/helpers/` coexisted one tier apart with overlapping purposes - Routes each file to its natural home based on what it actually *is*: page objects → `components/`, standalone utils → `utils/`, domain helper classes stay in `helpers/` - Adds an ESLint guard (`no-restricted-imports`) to prevent re-creating `browser_tests/helpers/` ## File Moves | File | From | To | Reason | |---|---|---|---| | `actionbar.ts` | `helpers/` | `fixtures/components/Actionbar.ts` | Page object class imported by ComfyPage | | `templates.ts` | `helpers/` | `fixtures/components/Templates.ts` | Page object class imported by ComfyPage | | `boundsUtils.ts` | `fixtures/helpers/` | `fixtures/utils/` | Pure function, not a helper class | | `mimeTypeUtil.ts` | `fixtures/helpers/` | `fixtures/utils/` | Pure function, not a helper class | | `builderTestUtils.ts` | `helpers/` | `fixtures/utils/` | Shared test setup functions | | `clipboardSpy.ts` | `helpers/` | `fixtures/utils/` | Page injection utility | | `fitToView.ts` | `helpers/` | `fixtures/utils/` | Canvas utility function | | `manageGroupNode.ts` | `helpers/` | `fixtures/utils/` | Litegraph interaction helper | | `painter.ts` | `helpers/` | `fixtures/utils/` | Test helper functions | | `perfReporter.ts` | `helpers/` | `fixtures/utils/` | Test infrastructure | | `promotedWidgets.ts` | `helpers/` | `fixtures/utils/` | Query helpers for specs | ## What Changed Beyond File Moves - **28 import statements** updated across test specs, fixtures, and infra files - **AGENTS.md** — directory tree diagram and architectural separation descriptions updated - **README.md** — "Leverage Existing Fixtures and Helpers" section updated - **`.claude/skills/perf-fix-with-proof/SKILL.md`** — perfReporter path reference updated - **`eslint.config.ts`** — added `@e2e/helpers/*` restricted import pattern to both spec and non-spec browser_tests rules ## Verification - `pnpm typecheck` — clean - `pnpm typecheck:browser` — clean - `pnpm lint` — 0 errors, 0 warnings - `pnpm format:check` — all files formatted - `pnpm knip` — clean - Pre-commit hooks passed full pipeline (oxfmt, oxlint, eslint, typecheck, typecheck:browser) ## Config Audit No changes needed to: `tsconfig.json` (`@e2e/*` alias covers all subdirs), `playwright.config.ts`, `vite.config.mts`, `knip.config.ts`, `.oxlintrc.json`, `nx.json` ## Manual Verification Note This is a pure structural refactoring (file moves + import updates) with zero behavioral or visual changes. The typecheck and lint passes confirm all imports resolve correctly. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-11411-refactor-consolidate-browser_tests-helpers-into-fixtures-3476d73d3650816cb671ef7fa8433f66) by [Unito](https://www.unito.io) --------- Co-authored-by: glary-bot <glary-bot@comfy.org> Co-authored-by: Glary-Bot <glary-bot@users.noreply.github.com> Co-authored-by: DrJKL <DrJKL0424@gmail.com> Co-authored-by: Amp <amp@ampcode.com>
79 lines
2.3 KiB
TypeScript
79 lines
2.3 KiB
TypeScript
import type { Locator, Page } from '@playwright/test'
|
|
import type { TestGraphAccess } from '@e2e/types/globals'
|
|
|
|
export async function drawStroke(
|
|
page: Page,
|
|
canvas: Locator,
|
|
opts: { startXPct?: number; endXPct?: number; yPct?: number } = {}
|
|
): Promise<void> {
|
|
const { startXPct = 0.3, endXPct = 0.7, yPct = 0.5 } = opts
|
|
const box = await canvas.boundingBox()
|
|
if (!box) throw new Error('Canvas bounding box not found')
|
|
await page.mouse.move(
|
|
box.x + box.width * startXPct,
|
|
box.y + box.height * yPct
|
|
)
|
|
await page.mouse.down()
|
|
await page.mouse.move(
|
|
box.x + box.width * endXPct,
|
|
box.y + box.height * yPct,
|
|
{ steps: 10 }
|
|
)
|
|
await page.mouse.up()
|
|
}
|
|
|
|
export async function hasCanvasContent(canvas: Locator): Promise<boolean> {
|
|
return canvas.evaluate((el: HTMLCanvasElement) => {
|
|
const ctx = el.getContext('2d')
|
|
if (!ctx) return false
|
|
const { data } = ctx.getImageData(0, 0, el.width, el.height)
|
|
for (let i = 3; i < data.length; i += 4) {
|
|
if (data[i] > 0) return true
|
|
}
|
|
return false
|
|
})
|
|
}
|
|
|
|
export async function triggerSerialization(page: Page): Promise<void> {
|
|
await page.waitForFunction(() => {
|
|
const graph = window.graph as TestGraphAccess | undefined
|
|
const node = graph?._nodes_by_id?.['1']
|
|
const widget = node?.widgets?.find((w) => w.name === 'mask')
|
|
return typeof widget?.serializeValue === 'function'
|
|
})
|
|
|
|
await page.evaluate(async () => {
|
|
const graph = window.graph as TestGraphAccess | undefined
|
|
if (!graph) {
|
|
throw new Error(
|
|
'Global window.graph is absent. Ensure workflow fixture is loaded.'
|
|
)
|
|
}
|
|
|
|
const node = graph._nodes_by_id?.['1']
|
|
if (!node) {
|
|
throw new Error(
|
|
'Target node with ID "1" not found in graph._nodes_by_id.'
|
|
)
|
|
}
|
|
|
|
const widgetIndex = node.widgets?.findIndex((w) => w.name === 'mask') ?? -1
|
|
if (widgetIndex === -1) {
|
|
throw new Error('Widget "mask" not found on target node 1.')
|
|
}
|
|
|
|
const widget = node.widgets?.[widgetIndex]
|
|
if (!widget) {
|
|
throw new Error(`Widget index ${widgetIndex} not found on target node 1.`)
|
|
}
|
|
|
|
if (typeof widget.serializeValue !== 'function') {
|
|
throw new Error(
|
|
'mask widget on node 1 does not have a serializeValue function.'
|
|
)
|
|
}
|
|
|
|
await widget.serializeValue(node, widgetIndex)
|
|
})
|
|
}
|