mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## Summary Add eslint-plugin-playwright as an oxlint JS plugin scoped to browser_tests/, enforcing Playwright best practices at lint time. ## Changes - **What**: Configure eslint-plugin-playwright@2.10.1 via oxlint's alpha `jsPlugins` field (`.oxlintrc.json` override scoped to `browser_tests/**/*.ts`). 18 recommended rules + `prefer-native-locators` + `require-to-pass-timeout` at error severity. All 173 initial violations resolved (config, auto-fix, manual fixes). `no-force-option` set to off — 28 violations need triage (canvas overlay workarounds vs unnecessary force) in a dedicated PR. - **Dependencies**: `eslint-plugin-playwright@^2.10.1` (devDependency, required by oxlint jsPlugins at runtime) ## Review Focus - `.oxlintrc.json` override structure — this is the first use of oxlint's JS plugins alpha feature in this repo - Manual fixes in spec files: `waitForSelector` → `locator.waitFor`, deprecated page methods → locator equivalents, `toPass()` timeout additions - Compound CSS selectors replaced with `.and()` (Playwright native locator composition) to avoid `prefer-native-locators` suppressions - Lint script changes in `package.json` to include `browser_tests/` in oxlint targets --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: GitHub Action <action@github.com>
231 lines
7.1 KiB
TypeScript
231 lines
7.1 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
|
|
test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
test('should toggle shortcuts panel visibility', async ({ comfyPage }) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await expect(bottomPanel.root).toBeHidden()
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await expect(bottomPanel.root).toBeVisible()
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await expect(bottomPanel.root).toBeHidden()
|
|
})
|
|
|
|
test('should display essentials shortcuts tab', async ({ comfyPage }) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
|
|
await expect(bottomPanel.shortcuts.essentialsTab).toBeVisible()
|
|
await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
|
|
await expect(bottomPanel.shortcuts.subcategoryTitles.first()).toBeVisible()
|
|
await expect(bottomPanel.shortcuts.keyBadges.first()).toBeVisible()
|
|
|
|
await expect(
|
|
comfyPage.page.getByRole('heading', { name: 'Workflow' })
|
|
).toBeVisible()
|
|
await expect(
|
|
comfyPage.page.getByRole('heading', { name: 'Node' })
|
|
).toBeVisible()
|
|
await expect(
|
|
comfyPage.page.getByRole('heading', { name: 'Queue' })
|
|
).toBeVisible()
|
|
})
|
|
|
|
test('should display view controls shortcuts tab', async ({ comfyPage }) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await bottomPanel.shortcuts.viewControlsTab.click()
|
|
|
|
await expect(bottomPanel.shortcuts.viewControlsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
|
|
await expect(bottomPanel.shortcuts.keyBadges.first()).toBeVisible()
|
|
|
|
await expect(
|
|
comfyPage.page.getByRole('heading', { name: 'View' })
|
|
).toBeVisible()
|
|
await expect(
|
|
comfyPage.page.getByRole('heading', { name: 'Panel Controls' })
|
|
).toBeVisible()
|
|
})
|
|
|
|
test('should switch between shortcuts tabs', async ({ comfyPage }) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
|
|
await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
|
|
await bottomPanel.shortcuts.viewControlsTab.click()
|
|
|
|
await expect(bottomPanel.shortcuts.viewControlsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
await expect(bottomPanel.shortcuts.essentialsTab).not.toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
|
|
await bottomPanel.shortcuts.essentialsTab.click()
|
|
|
|
await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
await expect(bottomPanel.shortcuts.viewControlsTab).not.toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
})
|
|
|
|
test('should display formatted keyboard shortcuts', async ({ comfyPage }) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
|
|
const keyBadges = bottomPanel.shortcuts.keyBadges
|
|
await keyBadges.first().waitFor({ state: 'visible' })
|
|
await expect.poll(() => keyBadges.count()).toBeGreaterThanOrEqual(1)
|
|
|
|
await expect
|
|
.poll(() => keyBadges.allTextContents())
|
|
.toEqual(
|
|
expect.arrayContaining([
|
|
expect.stringMatching(/^(Ctrl|Cmd|Shift|Alt)$/)
|
|
])
|
|
)
|
|
})
|
|
|
|
test('should maintain panel state when switching between panels', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
// Open shortcuts panel first
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await expect(bottomPanel.root).toBeVisible()
|
|
await expect(
|
|
comfyPage.page.locator('[id*="tab_shortcuts-essentials"]')
|
|
).toBeVisible()
|
|
|
|
// Try to open terminal panel - may show terminal OR close shortcuts
|
|
// depending on whether terminal tabs have loaded (async loading)
|
|
await bottomPanel.toggleButton.click()
|
|
|
|
// Check if terminal tabs loaded (Logs tab visible) or fell back to shortcuts toggle
|
|
const logsTab = comfyPage.page.getByRole('tab', { name: /Logs/i })
|
|
const hasTerminalTabs = await logsTab.isVisible().catch(() => false)
|
|
|
|
if (hasTerminalTabs) {
|
|
// Terminal panel is visible - verify we can switch back to shortcuts
|
|
await expect(bottomPanel.root).toBeVisible()
|
|
|
|
// Switch back to shortcuts
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
|
|
// Should show shortcuts content again
|
|
await expect(
|
|
comfyPage.page.locator('[id*="tab_shortcuts-essentials"]')
|
|
).toBeVisible()
|
|
} else {
|
|
// Terminal tabs not loaded - button toggled shortcuts off, reopen for verification
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await expect(bottomPanel.root).toBeVisible()
|
|
await expect(
|
|
comfyPage.page.locator('[id*="tab_shortcuts-essentials"]')
|
|
).toBeVisible()
|
|
}
|
|
})
|
|
|
|
test('should handle keyboard navigation', async ({ comfyPage }) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await bottomPanel.shortcuts.essentialsTab.focus()
|
|
|
|
await comfyPage.page.keyboard.press('ArrowRight')
|
|
|
|
await expect(bottomPanel.shortcuts.viewControlsTab).toBeFocused()
|
|
|
|
await comfyPage.page.keyboard.press('Enter')
|
|
|
|
await expect(bottomPanel.shortcuts.viewControlsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
})
|
|
|
|
test('should close panel by clicking shortcuts button again', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await expect(bottomPanel.root).toBeVisible()
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
await expect(bottomPanel.root).toBeHidden()
|
|
})
|
|
|
|
test('should display shortcuts in organized columns', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
|
|
await expect(comfyPage.page.getByTestId('shortcuts-columns')).toBeVisible()
|
|
|
|
const subcategoryTitles = bottomPanel.shortcuts.subcategoryTitles
|
|
await expect.poll(() => subcategoryTitles.count()).toBeGreaterThanOrEqual(2)
|
|
})
|
|
|
|
test('should open shortcuts panel with Ctrl+Shift+K', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await expect(bottomPanel.root).toBeHidden()
|
|
|
|
await comfyPage.page.keyboard.press('Control+Shift+KeyK')
|
|
|
|
await expect(bottomPanel.root).toBeVisible()
|
|
await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
})
|
|
|
|
test('should open settings dialog when clicking manage shortcuts button', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { bottomPanel } = comfyPage
|
|
|
|
await bottomPanel.keyboardShortcutsButton.click()
|
|
|
|
await expect(bottomPanel.shortcuts.manageButton).toBeVisible()
|
|
await bottomPanel.shortcuts.manageButton.click()
|
|
|
|
await expect(comfyPage.settingDialog.root).toBeVisible()
|
|
await expect(comfyPage.settingDialog.category('Keybinding')).toBeVisible()
|
|
})
|
|
})
|