mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +00:00
*PR Created by the Glary-Bot Agent* --- ## Summary - Convert ~120 getter-based locators across 18 browser test fixture files to `public readonly` constructor-assigned properties - Removes unnecessary indirection, makes object shape explicit, and improves IDE auto-complete / type inference - Keeps lazy-init getters (`??=`), computed properties, and `private get page()` convenience accessors as getters ## Changes **`browser_tests/fixtures/components/`** (6 files): `ComfyNodeSearchBox`, `ContextMenu`, `SettingDialog`, `SignInDialog`, `SidebarTab` (all 6 classes), `Topbar` **`browser_tests/fixtures/`** (4 files): `ComfyPage` (ComfyMenu.buttons, ComfyPage.visibleToasts), `UserSelectPage`, `ComfyMouse`, `VueNodeHelpers` **`browser_tests/fixtures/helpers/`** (7 files): `AppModeHelper`, `BuilderFooterHelper`, `BuilderSaveAsHelper`, `BuilderSelectHelper`, `BuilderStepsHelper`, `ToastHelper`, `NodeOperationsHelper` **`browser_tests/fixtures/utils/`** (1 file): `vueNodeFixtures` ## Validation - `pnpm typecheck` ✅ - `pnpm typecheck:browser` ✅ - `pnpm exec eslint browser_tests/fixtures/` ✅ - All pre-commit hooks pass (oxfmt, oxlint, eslint, typecheck, typecheck:browser) ✅ - No visual/manual verification needed — changes are test fixture locator declarations only (no UI or runtime behavior change) Fixes #11131 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-11135-refactor-standardize-Page-Object-locators-as-public-readonly-instead-of-getters-33e6d73d3650819690cbc639f3d30daf) by [Unito](https://www.unito.io) --------- Co-authored-by: Glary-Bot <glary-bot@users.noreply.github.com>
97 lines
2.3 KiB
TypeScript
97 lines
2.3 KiB
TypeScript
import type { Mouse } from '@playwright/test'
|
|
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import type { Position } from '@e2e/fixtures/types'
|
|
|
|
/**
|
|
* Used for drag and drop ops
|
|
* @see
|
|
* - {@link Mouse.down}
|
|
* - {@link Mouse.move}
|
|
* - {@link Mouse.up}
|
|
*/
|
|
interface DragOptions {
|
|
button?: 'left' | 'right' | 'middle'
|
|
clickCount?: number
|
|
steps?: number
|
|
}
|
|
|
|
/**
|
|
* Wraps mouse drag and drop to work with a canvas-based app.
|
|
*
|
|
* Requires the next frame animated before and after all steps, giving the
|
|
* canvas time to render the changes before screenshots are taken.
|
|
*/
|
|
export class ComfyMouse implements Omit<Mouse, 'move'> {
|
|
static defaultSteps = 5
|
|
static defaultOptions: DragOptions = { steps: ComfyMouse.defaultSteps }
|
|
|
|
readonly mouse: Mouse
|
|
|
|
constructor(readonly comfyPage: ComfyPage) {
|
|
this.mouse = comfyPage.page.mouse
|
|
}
|
|
|
|
async nextFrame() {
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
/** Drags from current location to a new location and hovers there (no pointerup event) */
|
|
async drag(to: Position, options = ComfyMouse.defaultOptions) {
|
|
const { steps, ...downOptions } = options
|
|
|
|
await this.mouse.down(downOptions)
|
|
await this.nextFrame()
|
|
|
|
await this.move(to, { steps })
|
|
await this.nextFrame()
|
|
}
|
|
|
|
async drop(options = ComfyMouse.defaultOptions) {
|
|
await this.mouse.up(options)
|
|
await this.nextFrame()
|
|
}
|
|
|
|
async dragAndDrop(
|
|
from: Position,
|
|
to: Position,
|
|
options = ComfyMouse.defaultOptions
|
|
) {
|
|
const { steps } = options
|
|
|
|
await this.nextFrame()
|
|
|
|
await this.move(from, { steps })
|
|
await this.drag(to, options)
|
|
await this.drop(options)
|
|
}
|
|
|
|
/** @see {@link Mouse.move} */
|
|
async move(to: Position, options = ComfyMouse.defaultOptions) {
|
|
await this.mouse.move(to.x, to.y, options)
|
|
await this.nextFrame()
|
|
}
|
|
|
|
//#region Pass-through
|
|
async click(...args: Parameters<Mouse['click']>) {
|
|
return await this.mouse.click(...args)
|
|
}
|
|
|
|
async dblclick(...args: Parameters<Mouse['dblclick']>) {
|
|
return await this.mouse.dblclick(...args)
|
|
}
|
|
|
|
async down(...args: Parameters<Mouse['down']>) {
|
|
return await this.mouse.down(...args)
|
|
}
|
|
|
|
async up(...args: Parameters<Mouse['up']>) {
|
|
return await this.mouse.up(...args)
|
|
}
|
|
|
|
async wheel(...args: Parameters<Mouse['wheel']>) {
|
|
return await this.mouse.wheel(...args)
|
|
}
|
|
//#endregion Pass-through
|
|
}
|