diff --git a/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs b/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs index 9de5f89e64f..70aa5015f18 100644 --- a/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs +++ b/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs @@ -76,7 +76,7 @@ export const PR_FEATURE_AREA_E2E_SOURCE_ROUTES = [ // Pane geometry and the link tooltip share terminal.css and the pane DOM. featureRoute( 'feature.terminal-pane-geometry', - ['issue-12656-terminal-link-tooltip', 'terminal-pane-padding-edges'], + ['issue-12656-terminal-link-tooltip'], [ 'src/renderer/src/assets/terminal.css', 'src/renderer/src/lib/pane-manager/pane-layout/pane-divider.ts', diff --git a/tests/e2e/tab-strip-active-dock.spec.ts b/tests/e2e/tab-strip-active-dock.spec.ts deleted file mode 100644 index 2ec9067d29e..00000000000 --- a/tests/e2e/tab-strip-active-dock.spec.ts +++ /dev/null @@ -1,159 +0,0 @@ -import type { Page } from '@stablyai/playwright-test' -import { test, expect } from './helpers/orca-app' -import { waitForSessionReady, waitForActiveWorktree, ensureTerminalVisible } from './helpers/store' - -const STRIP = '.terminal-tab-strip' - -function slotSelector(tabId: string): string { - return `${STRIP} > [data-tab-strip-slot="${tabId}"]` -} - -async function createBackgroundTerminalTab(page: Page, worktreeId: string): Promise { - return page.evaluate( - (wId) => - window.__store!.getState().createTab(wId, undefined, undefined, { activate: false }).id, - worktreeId - ) -} - -async function readStripSlotIds(page: Page): Promise { - return page.$$eval(`${STRIP} > [data-tab-strip-slot]`, (nodes) => - nodes.map((node) => node.getAttribute('data-tab-strip-slot') ?? '') - ) -} - -/** Where `tabId` is drawn relative to the strip's visible viewport, in px. */ -async function readSlotViewportSpan( - page: Page, - tabId: string -): Promise<{ left: number; right: number; viewLeft: number; viewRight: number }> { - return page.evaluate( - ({ strip, slot }) => { - const stripEl = document.querySelector(strip)! - const slotRect = document.querySelector(slot)!.getBoundingClientRect() - const viewLeft = stripEl.getBoundingClientRect().left + stripEl.clientLeft - return { - left: slotRect.left, - right: slotRect.right, - viewLeft, - viewRight: viewLeft + stripEl.clientWidth - } - }, - { strip: STRIP, slot: slotSelector(tabId) } - ) -} - -async function isSlotInView(page: Page, tabId: string): Promise { - const span = await readSlotViewportSpan(page, tabId) - return span.left >= span.viewLeft - 1 && span.right <= span.viewRight + 1 -} - -async function nextFrames(page: Page, count: number): Promise { - await page.evaluate(async (frames) => { - for (let i = 0; i < frames; i++) { - await new Promise(requestAnimationFrame) - } - }, count) -} - -test.describe('Tab strip active-tab dock', () => { - test.beforeEach(async ({ orcaPage }) => { - await waitForSessionReady(orcaPage) - await waitForActiveWorktree(orcaPage) - await ensureTerminalVisible(orcaPage) - }) - - for (const edge of ['start', 'end'] as const) { - test(`keeps inactive tabs clickable in a strip too narrow for the ${edge} dock`, async ({ - orcaPage - }) => { - const worktreeId = await waitForActiveWorktree(orcaPage) - for (let i = 0; i < 3; i++) { - await createBackgroundTerminalTab(orcaPage, worktreeId) - } - const ids = await readStripSlotIds(orcaPage) - const activeTabId = (edge === 'start' ? ids.at(0) : ids.at(-1))! - const inactiveTabId = (edge === 'start' ? ids.at(-1) : ids.at(0))! - const activeTab = orcaPage.locator( - `${slotSelector(activeTabId)} [data-testid="sortable-tab"]` - ) - const inactiveTab = orcaPage.locator( - `${slotSelector(inactiveTabId)} [data-testid="sortable-tab"]` - ) - await activeTab.click() - - const strip = orcaPage.locator(STRIP).first() - await strip.evaluate((el) => { - el.style.maxWidth = '200px' - }) - await expect(strip).toHaveAttribute('data-active-tab-dock-disabled', '') - await strip.evaluate((el, side) => { - el.scrollLeft = side === 'start' ? el.scrollWidth : 0 - }, edge) - await expect.poll(() => isSlotInView(orcaPage, inactiveTabId)).toBe(true) - await inactiveTab.click() - await expect(inactiveTab).toHaveAttribute('data-active', 'true') - await activeTab.locator('[data-tab-close-button]').click() - await expect(activeTab).toHaveCount(0) - - await strip.evaluate((el) => { - el.style.maxWidth = '400px' - }) - await expect(strip).not.toHaveAttribute('data-active-tab-dock-disabled') - await strip.evaluate((el, side) => { - el.scrollLeft = side === 'start' ? 0 : el.scrollWidth - }, edge) - await expect(strip).toHaveAttribute( - 'data-active-tab-docked', - edge === 'start' ? 'end' : 'start' - ) - expect(await isSlotInView(orcaPage, inactiveTabId)).toBe(true) - }) - } - - test('keeps inactive tabs clickable after cancelling a drag that scrolled a narrow strip', async ({ - orcaPage - }) => { - const worktreeId = await waitForActiveWorktree(orcaPage) - for (let i = 0; i < 3; i++) { - await createBackgroundTerminalTab(orcaPage, worktreeId) - } - const ids = await readStripSlotIds(orcaPage) - const activeSlot = orcaPage.locator(slotSelector(ids[0])) - const activeTab = activeSlot.locator('[data-testid="sortable-tab"]') - const inactiveTab = orcaPage.locator(`${slotSelector(ids[1])} [data-testid="sortable-tab"]`) - await activeTab.click() - - const strip = orcaPage.locator(STRIP).first() - await strip.evaluate((el) => { - el.style.maxWidth = '200px' - }) - await expect(strip).toHaveAttribute('data-active-tab-dock-disabled', '') - await strip.evaluate((el) => { - el.scrollLeft = 0 - }) - await expect.poll(() => isSlotInView(orcaPage, ids[0])).toBe(true) - - const box = (await activeTab.boundingBox())! - const y = box.y + box.height / 2 - await orcaPage.mouse.move(box.x + 20, y) - await orcaPage.mouse.down() - await orcaPage.mouse.move(box.x + 34, y) - await orcaPage.mouse.move(box.x + 38, y) - await expect(strip.locator('[data-active-tab-dock]')).toHaveCount(0) - - // Hidden-window drag overlays can intercept native wheel input before it reaches the strip. - await strip.evaluate((el) => { - el.dispatchEvent(new WheelEvent('wheel', { deltaY: 144, cancelable: true })) - }) - await expect.poll(() => strip.evaluate((el) => el.scrollLeft)).toBe(144) - await nextFrames(orcaPage, 2) - await orcaPage.evaluate(() => window.dispatchEvent(new Event('blur'))) - await orcaPage.mouse.up() - - await expect(activeSlot).toHaveAttribute('data-active-tab-dock', '') - await expect(strip).toHaveAttribute('data-active-tab-dock-disabled', '') - await inactiveTab.click() - await expect(inactiveTab).toHaveAttribute('data-active', 'true') - }) -}) diff --git a/tests/e2e/terminal-pane-padding-edges.spec.ts b/tests/e2e/terminal-pane-padding-edges.spec.ts deleted file mode 100644 index 3bf85281f73..00000000000 --- a/tests/e2e/terminal-pane-padding-edges.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { Page } from '@stablyai/playwright-test' -import { test, expect } from './helpers/orca-app' -import { ensureTerminalVisible } from './helpers/store' -import { waitForActiveTerminalManager } from './helpers/terminal' -import { setPaneTitleFromTerminalMenu } from './helpers/terminal-pane-title-actions' - -function readTerminalInsets( - page: Page -): Promise> { - return page - .locator('.xterm:visible') - .first() - .evaluate((xterm) => { - const container = xterm.closest('.xterm-container') - const pane = xterm.closest('.pane') - if (!container || !pane) { - throw new Error('No visible terminal pane found') - } - const outer = pane.getBoundingClientRect() - const inner = container.getBoundingClientRect() - return { - left: Math.round(inner.left - outer.left), - right: Math.round(outer.right - inner.right), - top: Math.round(inner.top - outer.top), - bottom: Math.round(outer.bottom - inner.bottom) - } - }) -} - -test('terminal padding insets both edges of each axis', async ({ orcaPage }) => { - await ensureTerminalVisible(orcaPage, 30_000) - await waitForActiveTerminalManager(orcaPage, 30_000) - await orcaPage.evaluate(async () => { - await window.__store?.getState().updateSettings({ terminalPaddingX: 40, terminalPaddingY: 20 }) - }) - - await expect - .poll(() => readTerminalInsets(orcaPage)) - .toEqual({ left: 40, right: 40, top: 20, bottom: 20 }) - - // A pane title replaces the top padding but must keep the bottom inset. - await setPaneTitleFromTerminalMenu(orcaPage, 'Padding check') - await expect - .poll(() => readTerminalInsets(orcaPage)) - .toEqual({ left: 40, right: 40, top: 24, bottom: 20 }) -})