Review feedback

Author: AustinMroz

browser_tests/tests/maskEditor.spec.ts

@@ -1,6 +1,10 @@
-import { expect } from '@playwright/test'
+import { expect, mergeTests } from '@playwright/test'
 
+import { ExecutionHelper } from '@e2e/fixtures/helpers/ExecutionHelper'
 import { maskEditorTest as test } from '@e2e/fixtures/helpers/MaskEditorHelper'
+import { webSocketFixture } from '@e2e/fixtures/ws'
+
+const wstest = mergeTests(test, webSocketFixture)
 
 test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   test(
@@ -302,29 +306,38 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   )
 })
 
-test('Will not use stale litegraph previews', async ({ comfyPage }) => {
-  await comfyPage.menu.topbar.newWorkflowButton.click()
-  await comfyPage.searchBoxV2.addNode('Preview Image')
-
-  async function simulateExecuted(image: object) {
-    await comfyPage.page.evaluate((pageImage) => {
-      const output = { images: [pageImage] }
-      const detail = { node: '1', output, prompt_id: '', display_node: '1' }
-      app!.api.dispatchCustomEvent('executed', detail)
-      app!.canvas.setDirty(true)
-    }, image)
-  }
-  async function getNodeOutput() {
-    return await comfyPage.page.evaluate(
-      () => graph!.getNodeById('1')!.images?.[0]?.filename
-    )
-  }
+wstest(
+  'Will not use stale litegraph previews',
+  async ({ comfyPage, getWebSocket }) => {
+    const executionHelper = new ExecutionHelper(comfyPage, await getWebSocket())
+    await comfyPage.menu.topbar.newWorkflowButton.click()
+    await comfyPage.searchBoxV2.addNode('Preview Image')
 
-  await simulateExecuted({ filename: 'test1.png' })
-  await expect.poll(getNodeOutput).toBe('test1.png')
+    async function getNodeOutput() {
+      return await comfyPage.page.evaluate(
+        () => graph!.getNodeById('1')!.images?.[0]?.filename
+      )
+    }
 
-  await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    executionHelper.executed('', '1', { images: [{ filename: 'test1.png' }] })
+    await comfyPage.page.evaluate(() => app!.canvas.setDirty(true))
+    await expect.poll(getNodeOutput).toBe('test1.png')
 
-  await simulateExecuted({ filename: 'example.png', type: 'input' })
-  await expect.poll(getNodeOutput).toBe('example.png')
-})
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+
+    const resolvableFile = { filename: 'example.png', type: 'input' }
+    executionHelper.executed('', '1', { images: [resolvableFile] })
+    await expect.poll(getNodeOutput).toBe('example.png')
+
+    const node = await comfyPage.vueNodes.getFixtureByTitle('Preview Image')
+    await node.imagePreview.hover()
+    await node.imagePreview
+      .getByRole('button', { name: 'Edit or mask image' })
+      .click()
+
+    // On previous versions, attempting to open the mask editor here would
+    // incorrectly reference the non-existant test1.png
+    // This causes the mask editor to throw in setup and not display
+    await expect(comfyPage.page.locator('.mask-editor-dialog')).toBeVisible()
+  }
+)