mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-06 13:40:25 +00:00
test: remove duplicate mockedPointerEvent helper in LinkConnector.integration.test.ts
Replace all usages of the local mockedPointerEvent helper with the shared createMockCanvasPointerEvent factory from litegraphTestUtils to avoid duplication and improve consistency across test files.
This commit is contained in:
@@ -12,7 +12,10 @@ import { LGraphNode, LLink, LinkConnector } from '@/lib/litegraph/src/litegraph'
|
||||
|
||||
import { test as baseTest } from '../__fixtures__/testExtensions'
|
||||
import type { ConnectingLink } from '@/lib/litegraph/src/interfaces'
|
||||
import { createMockCanvasRenderingContext2D } from '@/utils/__tests__/litegraphTestUtils'
|
||||
import {
|
||||
createMockCanvasPointerEvent,
|
||||
createMockCanvasRenderingContext2D
|
||||
} from '@/utils/__tests__/litegraphTestUtils'
|
||||
|
||||
interface TestContext {
|
||||
graph: LGraph
|
||||
@@ -186,15 +189,11 @@ const test = baseTest.extend<TestContext>({
|
||||
}
|
||||
})
|
||||
|
||||
function mockedPointerEvent(
|
||||
canvasX: number,
|
||||
canvasY: number
|
||||
): CanvasPointerEvent {
|
||||
return { canvasX, canvasY } as CanvasPointerEvent
|
||||
}
|
||||
|
||||
function mockedNodeTitleDropEvent(node: LGraphNode): CanvasPointerEvent {
|
||||
return mockedPointerEvent(node.pos[0] + node.size[0] / 2, node.pos[1] + 16)
|
||||
return createMockCanvasPointerEvent(
|
||||
node.pos[0] + node.size[0] / 2,
|
||||
node.pos[1] + 16
|
||||
)
|
||||
}
|
||||
|
||||
function mockedInputDropEvent(
|
||||
@@ -202,7 +201,7 @@ function mockedInputDropEvent(
|
||||
slot: number
|
||||
): CanvasPointerEvent {
|
||||
const pos = node.getInputPos(slot)
|
||||
return mockedPointerEvent(pos[0], pos[1])
|
||||
return createMockCanvasPointerEvent(pos[0], pos[1])
|
||||
}
|
||||
|
||||
function mockedOutputDropEvent(
|
||||
@@ -210,7 +209,7 @@ function mockedOutputDropEvent(
|
||||
slot: number
|
||||
): CanvasPointerEvent {
|
||||
const pos = node.getOutputPos(slot)
|
||||
return mockedPointerEvent(pos[0], pos[1])
|
||||
return createMockCanvasPointerEvent(pos[0], pos[1])
|
||||
}
|
||||
|
||||
describe('LinkConnector Integration', () => {
|
||||
@@ -238,7 +237,7 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
const canvasX = disconnectedNode.pos[0] + disconnectedNode.size[0] / 2
|
||||
const canvasY = disconnectedNode.pos[1] + 16
|
||||
const dropEvent = mockedPointerEvent(canvasX, canvasY)
|
||||
const dropEvent = createMockCanvasPointerEvent(canvasX, canvasY)
|
||||
|
||||
// Drop links, ensure reset has not been run
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
@@ -280,7 +279,7 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
const canvasX = disconnectedNode.pos[0] + disconnectedNode.size[0] / 2
|
||||
const canvasY = disconnectedNode.pos[1] + 16
|
||||
const dropEvent = mockedPointerEvent(canvasX, canvasY)
|
||||
const dropEvent = createMockCanvasPointerEvent(canvasX, canvasY)
|
||||
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
connector.reset()
|
||||
@@ -421,7 +420,7 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
const canvasX = disconnectedNode.pos[0] + disconnectedNode.size[0] / 2
|
||||
const canvasY = disconnectedNode.pos[1] + 16
|
||||
const dropEvent = mockedPointerEvent(canvasX, canvasY)
|
||||
const dropEvent = createMockCanvasPointerEvent(canvasX, canvasY)
|
||||
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
connector.reset()
|
||||
@@ -472,7 +471,7 @@ describe('LinkConnector Integration', () => {
|
||||
expect(floatingLink).toBeInstanceOf(LLink)
|
||||
const floatingReroute = LLink.getReroutes(graph, floatingLink)[0]
|
||||
|
||||
const dropEvent = mockedPointerEvent(
|
||||
const dropEvent = createMockCanvasPointerEvent(
|
||||
floatingReroute.pos[0],
|
||||
floatingReroute.pos[1]
|
||||
)
|
||||
@@ -554,7 +553,10 @@ describe('LinkConnector Integration', () => {
|
||||
const manyOutputsNode = graph.getNodeById(4)!
|
||||
const canvasX = floatingReroute.pos[0]
|
||||
const canvasY = floatingReroute.pos[1]
|
||||
const floatingRerouteEvent = mockedPointerEvent(canvasX, canvasY)
|
||||
const floatingRerouteEvent = createMockCanvasPointerEvent(
|
||||
canvasX,
|
||||
canvasY
|
||||
)
|
||||
|
||||
connector.moveOutputLink(graph, manyOutputsNode.outputs[0])
|
||||
connector.dropLinks(graph, floatingRerouteEvent)
|
||||
@@ -579,7 +581,7 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
const canvasX = reroute7.pos[0]
|
||||
const canvasY = reroute7.pos[1]
|
||||
const reroute7Event = mockedPointerEvent(canvasX, canvasY)
|
||||
const reroute7Event = createMockCanvasPointerEvent(canvasX, canvasY)
|
||||
|
||||
const toSortedRerouteChain = (linkIds: number[]) =>
|
||||
linkIds
|
||||
@@ -698,7 +700,7 @@ describe('LinkConnector Integration', () => {
|
||||
const canvasY = disconnectedNode.pos[1]
|
||||
|
||||
connector.dragFromReroute(graph, floatingReroute)
|
||||
connector.dropLinks(graph, mockedPointerEvent(canvasX, canvasY))
|
||||
connector.dropLinks(graph, createMockCanvasPointerEvent(canvasX, canvasY))
|
||||
connector.reset()
|
||||
|
||||
expect(graph.floatingLinks.size).toBe(0)
|
||||
@@ -716,7 +718,7 @@ describe('LinkConnector Integration', () => {
|
||||
const canvasY = reroute8.pos[1]
|
||||
|
||||
connector.dragFromReroute(graph, floatingReroute)
|
||||
connector.dropLinks(graph, mockedPointerEvent(canvasX, canvasY))
|
||||
connector.dropLinks(graph, createMockCanvasPointerEvent(canvasX, canvasY))
|
||||
connector.reset()
|
||||
|
||||
expect(graph.floatingLinks.size).toBe(0)
|
||||
@@ -801,7 +803,7 @@ describe('LinkConnector Integration', () => {
|
||||
connector.moveOutputLink(graph, floatingOutNode.outputs[0])
|
||||
|
||||
const manyOutputsNode = graph.getNodeById(4)!
|
||||
const dropEvent = mockedPointerEvent(
|
||||
const dropEvent = createMockCanvasPointerEvent(
|
||||
manyOutputsNode.pos[0],
|
||||
manyOutputsNode.pos[1]
|
||||
)
|
||||
@@ -818,7 +820,7 @@ describe('LinkConnector Integration', () => {
|
||||
connector.moveOutputLink(graph, manyOutputsNode.outputs[0])
|
||||
|
||||
const disconnectedNode = graph.getNodeById(9)!
|
||||
const dropEvent2 = mockedPointerEvent(
|
||||
const dropEvent2 = createMockCanvasPointerEvent(
|
||||
disconnectedNode.pos[0],
|
||||
disconnectedNode.pos[1]
|
||||
)
|
||||
@@ -953,7 +955,7 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
const targetReroute = graph.reroutes.get(targetRerouteId)!
|
||||
const nextLinkIds = getNextLinkIds(targetReroute.linkIds)
|
||||
const dropEvent = mockedPointerEvent(
|
||||
const dropEvent = createMockCanvasPointerEvent(
|
||||
targetReroute.pos[0],
|
||||
targetReroute.pos[1]
|
||||
)
|
||||
@@ -1096,7 +1098,10 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
connector.dragFromReroute(graph, fromReroute)
|
||||
|
||||
const dropEvent = mockedPointerEvent(toReroute.pos[0], toReroute.pos[1])
|
||||
const dropEvent = createMockCanvasPointerEvent(
|
||||
toReroute.pos[0],
|
||||
toReroute.pos[1]
|
||||
)
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
connector.reset()
|
||||
|
||||
@@ -1166,7 +1171,10 @@ describe('LinkConnector Integration', () => {
|
||||
const fromReroute = graph.reroutes.get(from)!
|
||||
const toReroute = graph.reroutes.get(to)!
|
||||
|
||||
const dropEvent = mockedPointerEvent(toReroute.pos[0], toReroute.pos[1])
|
||||
const dropEvent = createMockCanvasPointerEvent(
|
||||
toReroute.pos[0],
|
||||
toReroute.pos[1]
|
||||
)
|
||||
|
||||
connector.dragFromReroute(graph, fromReroute)
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
@@ -1200,7 +1208,10 @@ describe('LinkConnector Integration', () => {
|
||||
const node = graph.getNodeById(nodeId)!
|
||||
const input = node.inputs[0]
|
||||
const reroute = graph.getReroute(rerouteId)!
|
||||
const dropEvent = mockedPointerEvent(reroute.pos[0], reroute.pos[1])
|
||||
const dropEvent = createMockCanvasPointerEvent(
|
||||
reroute.pos[0],
|
||||
reroute.pos[1]
|
||||
)
|
||||
|
||||
connector.dragNewFromInput(graph, node, input)
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
@@ -1227,7 +1238,7 @@ describe('LinkConnector Integration', () => {
|
||||
|
||||
const node = graph.getNodeById(nodeId)!
|
||||
const reroute = graph.getReroute(rerouteId)!
|
||||
const dropEvent = mockedPointerEvent(node.pos[0], node.pos[1])
|
||||
const dropEvent = createMockCanvasPointerEvent(node.pos[0], node.pos[1])
|
||||
|
||||
connector.dragFromReroute(graph, reroute)
|
||||
connector.dropLinks(graph, dropEvent)
|
||||
@@ -1255,7 +1266,10 @@ describe('LinkConnector Integration', () => {
|
||||
const node = graph.getNodeById(nodeId)!
|
||||
const reroute = graph.getReroute(rerouteId)!
|
||||
const inputPos = node.getInputPos(0)
|
||||
const dropOnInputEvent = mockedPointerEvent(inputPos[0], inputPos[1])
|
||||
const dropOnInputEvent = createMockCanvasPointerEvent(
|
||||
inputPos[0],
|
||||
inputPos[1]
|
||||
)
|
||||
|
||||
connector.dragFromReroute(graph, reroute)
|
||||
connector.dropLinks(graph, dropOnInputEvent)
|
||||
|
||||
Reference in New Issue
Block a user