Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 176 additions & 0 deletions browser_tests/assets/missing/node_replacement_dynamic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
{
"last_node_id": 6,
"last_link_id": 4,
"nodes": [
{
"id": 1,
"type": "LoadImage",
"pos": [50, 100],
"size": [315, 314],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [1],
"slot_index": 0
},
{
"name": "MASK",
"type": "MASK",
"links": null
}
],
"properties": {
"Node name for S&R": "LoadImage"
},
"widgets_values": ["example.png", "image"]
},
{
"id": 2,
"type": "E2E_OldImageBatch",
"pos": [450, 100],
"size": [210, 46],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [
{
"name": "image1",
"type": "IMAGE",
"link": 1
},
{
"name": "image2",
"type": "IMAGE",
"link": 2
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [3],
"slot_index": 0
}
],
"properties": {
"Node name for S&R": "E2E_OldImageBatch"
},
"widgets_values": []
},
{
"id": 3,
"type": "E2E_OldImageScaleBy",
"pos": [750, 100],
"size": [315, 82],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"name": "image",
"type": "IMAGE",
"link": 3
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [4],
"slot_index": 0
}
],
"properties": {
"Node name for S&R": "E2E_OldImageScaleBy"
},
"widgets_values": ["lanczos", 1.5]
},
{
"id": 4,
"type": "SaveImage",
"pos": [1150, 100],
"size": [315, 270],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 4
}
],
"outputs": [],
"properties": {},
"widgets_values": ["ComfyUI"]
},
{
"id": 5,
"type": "E2E_OldAdapterLoader",
"pos": [450, 400],
"size": [315, 58],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "CONTROL_NET",
"type": "CONTROL_NET",
"links": null
}
],
"properties": {
"Node name for S&R": "E2E_OldAdapterLoader"
},
"widgets_values": ["t2iadapter_model.safetensors"]
},
{
"id": 6,
"type": "LoadImage",
"pos": [50, 500],
"size": [315, 314],
"flags": {},
"order": 5,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [2],
"slot_index": 0
},
{
"name": "MASK",
"type": "MASK",
"links": null
}
],
"properties": {
"Node name for S&R": "LoadImage"
},
"widgets_values": ["example.png", "image"]
}
],
"links": [
[1, 1, 0, 2, 0, "IMAGE"],
[2, 6, 0, 2, 1, "IMAGE"],
[3, 2, 0, 3, 0, "IMAGE"],
[4, 3, 0, 4, 0, "IMAGE"]
],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 1,
"offset": [0, 0]
}
},
"version": 0.4
}
44 changes: 44 additions & 0 deletions browser_tests/fixtures/data/nodeReplacements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,50 @@ export const mockNodeReplacements: NodeReplacementResponse = {
]
}

/**
* Mirrors ComfyUI's built-in replacements whose targets use Autogrow and
* DynamicCombo inputs, or that omit `old_widget_ids`.
*/
export const mockDynamicInputReplacements: NodeReplacementResponse = {
E2E_OldImageBatch: [
{
new_node_id: 'BatchImagesNode',
old_node_id: 'E2E_OldImageBatch',
old_widget_ids: null,
input_mapping: [
{ new_id: 'images.image0', old_id: 'image1' },
{ new_id: 'images.image1', old_id: 'image2' }
],
output_mapping: null
}
],
E2E_OldImageScaleBy: [
{
new_node_id: 'ResizeImageMaskNode',
old_node_id: 'E2E_OldImageScaleBy',
old_widget_ids: ['upscale_method', 'scale_by'],
input_mapping: [
{ new_id: 'input', old_id: 'image' },
{ new_id: 'resize_type', set_value: 'scale by multiplier' },
{ new_id: 'resize_type.multiplier', old_id: 'scale_by' },
{ new_id: 'scale_method', old_id: 'upscale_method' }
],
output_mapping: null
}
],
E2E_OldAdapterLoader: [
{
new_node_id: 'ControlNetLoader',
old_node_id: 'E2E_OldAdapterLoader',
old_widget_ids: null,
input_mapping: [
{ new_id: 'control_net_name', old_id: 't2i_adapter_name' }
],
output_mapping: null
}
]
}

/** Subset containing only the E2E_OldSampler replacement. */
export const mockNodeReplacementsSingle: NodeReplacementResponse = {
E2E_OldSampler: mockNodeReplacements.E2E_OldSampler
Expand Down
46 changes: 46 additions & 0 deletions browser_tests/tests/nodeReplacement.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
comfyExpect as expect
} from '@e2e/fixtures/ComfyPage'
import {
mockDynamicInputReplacements,
mockNodeReplacements,
mockNodeReplacementsSingle
} from '@e2e/fixtures/data/nodeReplacements'
Expand All @@ -12,6 +13,7 @@ import {
setupNodeReplacement
} from '@e2e/fixtures/helpers/NodeReplacementHelper'
import { TestIds } from '@e2e/fixtures/selectors'
import { getInputNames } from '@e2e/fixtures/utils/nodeInputLinks'
import { toNodeId } from '@comfyorg/graph-model/nodeId'

const renderModes = [
Expand Down Expand Up @@ -51,6 +53,50 @@ test.describe('Node replacement', { tag: ['@node', '@ui'] }, () => {
})
})

test.describe('Dynamic input replacement', () => {
test.beforeEach(async ({ comfyPage }) => {
await setupNodeReplacement(comfyPage, mockDynamicInputReplacements)
await loadWorkflowAndOpenErrorsTab(
comfyPage,
'missing/node_replacement_dynamic'
)
})

test('Replacing into Autogrow and DynamicCombo inputs keeps links and values', async ({
comfyPage
}) => {
const swapGroup = getSwapNodesGroup(comfyPage.page)
await swapGroup
.getByRole('button', { name: 'Replace All', exact: true })
.click()
await expect(swapGroup).toBeHidden()

const prompt = await comfyPage.workflow.getExportedWorkflow({ api: true })
expect(prompt['2']).toMatchObject({
class_type: 'BatchImagesNode',
inputs: { 'images.image0': ['1', 0], 'images.image1': ['6', 0] }
})
await expect
.poll(() => getInputNames(comfyPage, '2', 'images.'), {
message: 'Autogrow should offer an empty slot after the moved links'
})
.toEqual(['images.image0', 'images.image1', 'images.image2'])
expect(prompt['3']).toMatchObject({
class_type: 'ResizeImageMaskNode',
inputs: {
input: ['2', 0],
resize_type: 'scale by multiplier',
'resize_type.multiplier': 1.5,
scale_method: 'lanczos'
}
})
expect(prompt['5']).toMatchObject({
class_type: 'ControlNetLoader',
inputs: { control_net_name: 't2iadapter_model.safetensors' }
})
})
})

for (const mode of renderModes) {
test.describe(
`(${mode.name})`,
Expand Down
Loading
Loading