Skip to content

Commit 5e3c91f

Browse files
committed
Merge remote-tracking branch 'origin/bl-more-slots' into bl-snap
2 parents f13a45c + 066a755 commit 5e3c91f

File tree

45 files changed

+458
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+458
-553
lines changed

browser_tests/tests/vueNodes/interactions/zoom.spec.ts renamed to browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
comfyExpect as expect,
33
comfyPageFixture as test
4-
} from '../../../fixtures/ComfyPage'
4+
} from '../../../../fixtures/ComfyPage'
55

66
test.describe('Vue Nodes Zoom', () => {
77
test.beforeEach(async ({ comfyPage }) => {
File renamed without changes.

browser_tests/tests/vueNodes/linkInteraction.spec.ts renamed to browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type { Locator, Page } from '@playwright/test'
22

3-
import type { NodeId } from '../../../src/platform/workflow/validation/schemas/workflowSchema'
4-
import { getSlotKey } from '../../../src/renderer/core/layout/slots/slotIdentifier'
3+
import type { NodeId } from '../../../../../src/platform/workflow/validation/schemas/workflowSchema'
4+
import { getSlotKey } from '../../../../../src/renderer/core/layout/slots/slotIdentifier'
55
import {
66
comfyExpect as expect,
77
comfyPageFixture as test
8-
} from '../../fixtures/ComfyPage'
9-
import { getMiddlePoint } from '../../fixtures/utils/litegraphUtils'
10-
import { fitToViewInstant } from '../../helpers/fitToView'
8+
} from '../../../../fixtures/ComfyPage'
9+
import { getMiddlePoint } from '../../../../fixtures/utils/litegraphUtils'
10+
import { fitToViewInstant } from '../../../../helpers/fitToView'
1111

1212
async function getCenter(locator: Locator): Promise<{ x: number; y: number }> {
1313
const box = await locator.boundingBox()
@@ -189,6 +189,13 @@ test.describe('Vue Node Link Interaction', () => {
189189

190190
expect(await samplerOutput.getLinkCount()).toBe(0)
191191
expect(await clipInput.getLinkCount()).toBe(0)
192+
193+
const graphLinkDetails = await getInputLinkDetails(
194+
comfyPage.page,
195+
clipNode.id,
196+
0
197+
)
198+
expect(graphLinkDetails).toBeNull()
192199
})
193200

194201
test('should not create a link when dropping onto a slot on the same node', async ({
@@ -218,7 +225,6 @@ test.describe('Vue Node Link Interaction', () => {
218225
const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
219226
const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
220227
expect(samplerNode && vaeNode).toBeTruthy()
221-
222228
const samplerOutputCenter = await getSlotCenter(
223229
comfyPage.page,
224230
samplerNode.id,
53.7 KB
Loading
51.2 KB
Loading
51.6 KB
Loading
53.1 KB
Loading
55.5 KB
Loading
53.4 KB
Loading

browser_tests/tests/vueNodes/deleteKeyInteraction.spec.ts renamed to browser_tests/tests/vueNodes/interactions/node/remove.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect } from '@playwright/test'
22

3-
import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
3+
import { comfyPageFixture as test } from '../../../../fixtures/ComfyPage'
44

55
test.beforeEach(async ({ comfyPage }) => {
66
await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')

0 commit comments

Comments
 (0)