From 34d7f4b7df24569d445c336aa23677a61f10432f Mon Sep 17 00:00:00 2001 From: bymyself Date: Tue, 11 Nov 2025 11:47:42 -0800 Subject: [PATCH] fix: import comfyExpect from ComfyPage in 4-level vueNodes tests --- .../tests/vueNodes/interactions/canvas/pan.spec.ts | 6 ++---- .../tests/vueNodes/interactions/canvas/zoom.spec.ts | 6 ++---- .../vueNodes/interactions/links/linkInteraction.spec.ts | 6 ++---- .../tests/vueNodes/interactions/node/move.spec.ts | 8 +++----- .../tests/vueNodes/interactions/node/rename.spec.ts | 6 ++---- .../tests/vueNodes/interactions/node/select.spec.ts | 6 ++---- .../tests/vueNodes/widgets/int/integerWidget.spec.ts | 6 ++---- .../tests/vueNodes/widgets/load/uploadWidgets.spec.ts | 6 ++---- .../vueNodes/widgets/text/multilineStringWidget.spec.ts | 8 +++----- 9 files changed, 20 insertions(+), 38 deletions(-) diff --git a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts index e5f3ba74cb..506b344181 100644 --- a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts @@ -1,7 +1,5 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' test.describe('Vue Nodes Canvas Pan', () => { test.beforeEach(async ({ comfyPage }) => { diff --git a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts index 07e05353db..2cbfda7f3e 100644 --- a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts @@ -1,7 +1,5 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' test.describe('Vue Nodes Zoom', () => { test.beforeEach(async ({ comfyPage }) => { diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts index fc4ca5050e..23606837d7 100644 --- a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts @@ -2,10 +2,8 @@ import type { Locator, Page } from '@playwright/test' import type { NodeId } from '../../../../../src/platform/workflow/validation/schemas/workflowSchema' import { getSlotKey } from '../../../../../src/renderer/core/layout/slots/slotIdentifier' -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' import { getMiddlePoint } from '../../../../fixtures/utils/litegraphUtils' import { fitToViewInstant } from '../../../../helpers/fitToView' diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts index 7f63938329..633d14441c 100644 --- a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts @@ -1,8 +1,6 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' -import type { ComfyPage } from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' +import type { ComfyPage } from '../../../../fixtures/ComfyPage' import type { Position } from '../../../../fixtures/types' test.describe('Vue Node Moving', () => { diff --git a/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts b/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts index 2bf0767fa2..5c786a3cbd 100644 --- a/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts @@ -1,7 +1,5 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' test.describe('Vue Nodes Renaming', () => { test.beforeEach(async ({ comfyPage }) => { diff --git a/browser_tests/tests/vueNodes/interactions/node/select.spec.ts b/browser_tests/tests/vueNodes/interactions/node/select.spec.ts index 67456c81f4..ccf8dcdb6c 100644 --- a/browser_tests/tests/vueNodes/interactions/node/select.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/node/select.spec.ts @@ -1,7 +1,5 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' test.beforeEach(async ({ comfyPage }) => { await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled') diff --git a/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts b/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts index f462dc7df5..072f04da13 100644 --- a/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts @@ -1,7 +1,5 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' test.describe('Vue Integer Widget', () => { test.beforeEach(async ({ comfyPage }) => { diff --git a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts index cc996ae800..b3ceea8308 100644 --- a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts @@ -1,7 +1,5 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' test.describe('Vue Upload Widgets', () => { test.beforeEach(async ({ comfyPage }) => { diff --git a/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts b/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts index ef36eafd29..d81c15cd45 100644 --- a/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts @@ -1,8 +1,6 @@ -import { - comfyExpect as expect, - comfyPageFixture as test -} from '../../../../fixtures/comfyPageFixture' -import type { ComfyPage } from '../../../../fixtures/comfyPageFixture' +import { comfyPageFixture as test } from '../../../../fixtures/comfyPageFixture' +import { comfyExpect as expect } from '../../../../fixtures/ComfyPage' +import type { ComfyPage } from '../../../../fixtures/ComfyPage' test.describe('Vue Multiline String Widget', () => { test.beforeEach(async ({ comfyPage }) => {