diff --git a/browser_tests/ComfyPage.ts b/browser_tests/ComfyPage.ts index 032ab4044..ad27bb9d3 100644 --- a/browser_tests/ComfyPage.ts +++ b/browser_tests/ComfyPage.ts @@ -1,7 +1,7 @@ import type { Page, Locator, APIRequestContext } from '@playwright/test' import { expect } from '@playwright/test' import { test as base } from '@playwright/test' -import { ComfyAppMenu } from './helpers/appMenu' +import { ComfyActionbar } from './helpers/actionbar' import dotenv from 'dotenv' dotenv.config() import * as fs from 'fs' @@ -374,7 +374,7 @@ export class ComfyPage { // Components public readonly searchBox: ComfyNodeSearchBox public readonly menu: ComfyMenu - public readonly appMenu: ComfyAppMenu + public readonly actionbar: ComfyActionbar public readonly templates: ComfyTemplates constructor( @@ -389,7 +389,7 @@ export class ComfyPage { this.workflowUploadInput = page.locator('#comfy-file-input') this.searchBox = new ComfyNodeSearchBox(page) this.menu = new ComfyMenu(page) - this.appMenu = new ComfyAppMenu(page) + this.actionbar = new ComfyActionbar(page) this.templates = new ComfyTemplates(page) } diff --git a/browser_tests/appMenu.spec.ts b/browser_tests/appMenu.spec.ts index f7b3d1495..97e892b3e 100644 --- a/browser_tests/appMenu.spec.ts +++ b/browser_tests/appMenu.spec.ts @@ -6,7 +6,7 @@ import { webSocketFixture } from './fixtures/ws.ts' const test = mergeTests(comfyPageFixture, webSocketFixture) -test.describe('AppMenu', () => { +test.describe('Actionbar', () => { test.beforeEach(async ({ comfyPage }) => { await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') }) @@ -23,12 +23,12 @@ test.describe('AppMenu', () => { ws }) => { // Enable change auto-queue mode - const queueOpts = await comfyPage.appMenu.queueButton.toggleOptions() + const queueOpts = await comfyPage.actionbar.queueButton.toggleOptions() expect(await queueOpts.getMode()).toBe('disabled') await queueOpts.setMode('change') await comfyPage.nextFrame() expect(await queueOpts.getMode()).toBe('change') - await comfyPage.appMenu.queueButton.toggleOptions() + await comfyPage.actionbar.queueButton.toggleOptions() // Intercept the prompt queue endpoint let promptNumber = 0 diff --git a/browser_tests/helpers/appMenu.ts b/browser_tests/helpers/actionbar.ts similarity index 80% rename from browser_tests/helpers/appMenu.ts rename to browser_tests/helpers/actionbar.ts index 840005dec..e5980d0ab 100644 --- a/browser_tests/helpers/appMenu.ts +++ b/browser_tests/helpers/actionbar.ts @@ -1,12 +1,12 @@ import type { Page, Locator } from '@playwright/test' import type { AutoQueueMode } from '../../src/stores/queueStore' -export class ComfyAppMenu { +export class ComfyActionbar { public readonly root: Locator public readonly queueButton: ComfyQueueButton constructor(public readonly page: Page) { - this.root = page.locator('.app-menu') + this.root = page.locator('.actionbar') this.queueButton = new ComfyQueueButton(this) } } @@ -15,15 +15,15 @@ class ComfyQueueButton { public readonly root: Locator public readonly primaryButton: Locator public readonly dropdownButton: Locator - constructor(public readonly appMenu: ComfyAppMenu) { - this.root = appMenu.root.getByTestId('queue-button') + constructor(public readonly actionbar: ComfyActionbar) { + this.root = actionbar.root.getByTestId('queue-button') this.primaryButton = this.root.locator('.p-splitbutton-button') this.dropdownButton = this.root.locator('.p-splitbutton-dropdown') } public async toggleOptions() { await this.dropdownButton.click() - return new ComfyQueueButtonOptions(this.appMenu.page) + return new ComfyQueueButtonOptions(this.actionbar.page) } } diff --git a/src/components/appMenu/BatchCountEdit.vue b/src/components/actionbar/BatchCountEdit.vue similarity index 100% rename from src/components/appMenu/BatchCountEdit.vue rename to src/components/actionbar/BatchCountEdit.vue diff --git a/src/components/appMenu/AppMenu.vue b/src/components/actionbar/ComfyActionbar.vue similarity index 98% rename from src/components/appMenu/AppMenu.vue rename to src/components/actionbar/ComfyActionbar.vue index f82b9518d..6f4ad9578 100644 --- a/src/components/appMenu/AppMenu.vue +++ b/src/components/actionbar/ComfyActionbar.vue @@ -1,11 +1,11 @@