mirror of
https://github.com/stablyai/orca.git
synced 2026-11-01 01:27:35 +00:00
* [comment audit] Align legacy failure-read counts with cached display * [comment audit] Condense shared provider lifecycle and browser recovery comments [skip ci] * [comment audit] Condense shared generation, path and preview comments [skip ci] * [comment audit] Condense host, file and Git contract rationale [skip ci] * [comment audit] Tighten Git lifecycle and provider contract comments [skip ci] * [comment audit] Clarify shared host authority and launch isolation [skip ci] * [comment audit] simplify local access mobile and native chat contracts [skip ci] * [comment audit] simplify native chat presentation and state contracts [skip ci] * [comment audit] simplify native runtime and provider contracts [skip ci] * [comment audit] simplify migration and orchestration contracts [skip ci] * [comment audit] simplify plugin trust and process capture rationale [skip ci] * [comment audit] simplify terminal delivery and remote compatibility rationale [skip ci] * [comment audit] clarify remote recovery and launch wire rationale [skip ci] * [comment audit] shorten shared RPC compatibility and runtime evidence comments [skip ci] * [comment audit] simplify secure storage shell startup and sidebar rationale [skip ci] * [comment audit] clarify sidebar, skill and SSH invariants [skip ci] * [comment audit] condense structured chat delivery and timing rationale [skip ci] * [comment audit] condense terminal replay and telemetry invariants [skip ci] * [comment audit] clarify launch permission and terminal delivery rationale [skip ci] * [comment audit] clarify workspace ownership and layout contracts [skip ci] * [comment audit] wait for fitted and painted SSH terminal links * [comment audit] clarify layout persistence and session ownership [skip ci] * [comment audit] clarify host routing and workspace lifecycle contracts [skip ci] * [comment audit] clarify startup persistence and app lifetime comments [skip ci] * [comment audit] clarify recovery and activity boundaries [skip ci] * [comment audit] condense activity and artifact invariants [skip ci] * [comment audit] condense automation authority contracts [skip ci] * [comment audit] simplify automation scheduling and history contracts [skip ci] * [comment audit] clarify browser chrome and annotation lifecycles [skip ci] * [comment audit] clarify browser routing and retained guest ownership [skip ci] * [comment audit] clarify browser recovery and document ownership comments [skip ci] * [comment audit] restore hosted runners required by native IME fixtures * [comment audit] shorten preview, palette and dashboard invariants [skip ci] * [comment audit] clarify terminal preview, dashboard and retention comments [skip ci] * [comment audit] clarify diff-note recovery and editor lifecycle comments [skip ci] * [comment audit] shorten rich-text and combined-diff ownership comments [skip ci] * [comment audit] shorten autosave, draft recovery and model ownership comments [skip ci] * [comment audit] shorten save-queue, notebook and Markdown constraints [skip ci] * [comment audit] shorten Monaco, PDF and rich Markdown safeguards [skip ci] * [comment audit] clarify rich Markdown source and selection safeguards [skip ci] * [comment audit] clarify editor loading and emulator stream lifetimes [skip ci] * [comment audit] trim emulator and feature tour narration [skip ci] * [comment audit] clarify floating workspace and GitHub cache ownership [skip ci] * [comment audit] trim provider controls and Linear filter explanations [skip ci] * [comment audit] clarify pairing and chat resume lifetimes [skip ci] * [comment audit] clarify chat delivery and transcript lifetimes [skip ci] * [comment audit] clarify session options and host-owned status [skip ci] * [comment audit] clarify draft durability and live-status precedence [skip ci] * [comment audit] Trim chat send and model ownership explanations [skip ci] * [comment audit] Shorten transcript ownership and send recovery comments [skip ci] * [comment audit] Simplify native chat composer and transcript hook comments [skip ci] * [comment audit] Shorten native chat scroll and structured session explanations [skip ci] * [comment audit] Trim workspace picker and onboarding commentary [skip ci] * [comment audit] Simplify pet rendering, review cache and quick open comments [skip ci] * [comment audit] Trim sidebar and session history explanations [skip ci] * [comment audit] Condense session resume and review checks comments [skip ci] * [comment audit] Shorten checks state and file explorer refresh comments [skip ci] * [comment audit] Trim plugin bridge and source-control action rationale [skip ci] * [comment audit] Trim source-control listing and review rationale [skip ci] * [comment audit] Shorten sidebar lifecycle and explorer safeguards [skip ci] * [comment audit] Condense Settings account and appearance rationale [skip ci] * [comment audit] Trim pairing and repository Settings explanations [skip ci] * [comment audit] Condense Settings search SSH and terminal safeguards [skip ci] * [comment audit] Shorten Settings voice and provider ownership comments [skip ci] * [comment audit] Condense Settings draft persistence and host-state rationale [skip ci] * [comment audit] Trim Settings hooks and sidebar setup rationale [skip ci] * [comment audit] Condense sidebar deletion and board-filter safeguards [skip ci] * [comment audit] Condense worktree cards, host ownership and Markdown contracts [skip ci] * [comment audit] Condense sidebar drag, folder and filtering contracts [skip ci] * [comment audit] Condense sidebar parity, sleep and host ownership contracts [skip ci] * [comment audit] Prune focus-read baseline after comment cleanup * [comment audit] Clarify sidebar visibility, board drops and agent evidence [skip ci] * [comment audit] Tighten sidebar listing, drag and reveal contracts [skip ci] * [comment audit] Clarify viewport geometry and skill update safeguards [skip ci] * [comment audit] Tighten skill inventory, usage and host status comments [skip ci] * [comment audit] Clarify usage ownership and resource kill safeguards [skip ci] * [comment audit] Tighten tab selection, rename and search contracts [skip ci] * [comment audit] Tighten tab-strip geometry and drag ownership comments [skip ci] * [comment audit] Tighten Tasks recovery, pagination and mutation comments [skip ci] * [comment audit] Tighten provider loading and terminal recovery comments [skip ci] * [comment audit] Tighten completion, cadence and PTY ownership comments [skip ci] * [comment audit] Clarify terminal restore and parked-pane boundaries [skip ci] * [comment audit] Tighten PTY startup and replay explanations [skip ci] * [comment audit] Clarify PTY identity and delivery ownership [skip ci] * [comment audit] Shorten remote reconnect and input replay rationale [skip ci] * [comment audit] Condense terminal parking clipboard and file link comments [skip ci] * [comment audit] Clarify IME ownership and trim trace history [skip ci] * [comment audit] Shorten pane recovery and parked watcher explanations [skip ci] * [comment audit] Condense snapshot replay and visibility recovery rationale [skip ci] * [comment audit] Shorten terminal parking and keyboard ownership rationale [skip ci] * [comment audit] Trim renderer lifecycle and menu rationale [skip ci] * [comment audit] Condense workspace cleanup ownership and settlement notes [skip ci] * [comment audit] Clarify renderer hook evidence and source ownership [skip ci] * [comment audit] Tighten IPC ownership and reconnect explanations [skip ci] * [comment audit] Trim renderer focus, paste and attention comments [skip ci] * [comment audit] Shorten scroll, locale and agent lifecycle comments [skip ci] * [comment audit] Trim agent launch, resume and ownership commentary [skip ci] * [comment audit] Shorten account, browser and editor comments [skip ci] * [comment audit] Clarify host-mirror waits, previews and input ownership [skip ci] * [comment audit] Condense launch recovery and editor tokenization comments [skip ci] * [comment audit] Condense workspace selection and terminal pane rationale [skip ci] * [comment audit] Condense terminal fitting and rendering recovery comments [skip ci] * [comment audit] Condense terminal input and host routing explanations [skip ci] * [comment audit] Condense ownership and sleeping-session recovery rationale [skip ci] * [comment audit] Condense structured launch and terminal link explanations [skip ci] * [comment audit] Condense terminal ownership and workspace file routing rationale [skip ci] * [comment audit] Condense session persistence and workspace activation rationale [skip ci] * [comment audit] Condense workspace routing and browser ownership rationale [skip ci] * [comment audit] Condense mirror recovery and layout authority rationale [skip ci] * [comment audit] Condense runtime transport and file safety rationale [skip ci] * [comment audit] Condense runtime graph and structured session rationale [skip ci] * [comment audit] Condense browser creation and remote tab recovery rationale [skip ci] * [comment audit] Condense snapshot authority and publisher recovery rationale [skip ci] * [comment audit] Condense frame, startup and provider cache rationale [skip ci] * [comment audit] Condense host twin and agent lifecycle rationale [skip ci] * [comment audit] Condense browser authority and editor cleanup rationale [skip ci] * [comment audit] Condense editor buffer identity and review cache rationale [skip ci] * [comment audit] Condense provider lifetime and repository ownership rationale [skip ci] * [comment audit] Condense reconnect, hydration and terminal retirement rationale [skip ci] * [comment audit] Condense recovery, reconciliation and persistence rationale [skip ci] * [comment audit] Condense cleanup ownership and listing admission rationale [skip ci] * [comment audit] Condense teardown ordering and terminal ownership rationale [skip ci] * [comment audit] Condense recovery ledger and web host-boundary rationale [skip ci] * [comment audit] Condense web reconnect and credential lifecycle rationale [skip ci] * [comment audit] Condense cloud rollout and assignment safety rationale [skip ci] * [comment audit] Condense relay session and database recovery rationale [skip ci] * [comment audit] Condense relay placement and protocol compatibility rationale [skip ci] * [comment audit] Condense build and packaging constraints [skip ci] * [comment audit] Condense CI gates and validation isolation rationale [skip ci] * [comment audit] Condense catalog identity and browser validation rationale [skip ci] * [comment audit] Condense mobile browser and frame-budget rationale [skip ci] * [comment audit] Shorten mobile route and browser test explanations [skip ci] * [comment audit] Condense editor and session seam test rationale [skip ci] * [comment audit] Trim session and terminal closure history [skip ci] * [comment audit] Shorten terminal browser and census explanations [skip ci] * [comment audit] Preserve root-only E2E diagnostic baseline * [comment audit] Condense mobile seam and HTML preview test rationale [skip ci] * [comment audit] Condense preview instrumentation and render harness rationale [skip ci] * [comment audit] Condense bundle contracts and native-build constraints [skip ci] * [comment audit] Shorten native packaging and CI routing rationale [skip ci] * [comment audit] Condense release tooling and benchmark constraints [skip ci] * [comment audit] Condense packaging and platform gate rationale [skip ci] * [comment audit] Shorten mobile route and history rationale [skip ci] * [comment audit] Condense mobile browser and component rationale [skip ci] * [comment audit] Shorten drawer and workspace-form rationale [skip ci] * [comment audit] Trim mobile review and editor-document explanations [skip ci] * [comment audit] Condense editor lifecycle and Markdown explanations [skip ci] * [comment audit] Trim mobile file, diagnostics and dictation commentary [skip ci] * [comment audit] Simplify mobile host-list and workspace-view explanations [skip ci] * [comment audit] Clarify mobile shell lifetime and bridge delivery constraints [skip ci] * [comment audit] Condense bridge stream, native request and audio rationale [skip ci] * [comment audit] Reduce bridge schema and page-client commentary [skip ci] * [comment audit] Tighten mobile page bridge contracts [skip ci] * [comment audit] Clarify mobile cache and session constraints [skip ci] * [comment audit] Condense mobile route and lifecycle rationale [skip ci] * [comment audit] Tighten mobile shell hook timing rationale [skip ci] * [comment audit] Clarify route handoff and notification compatibility [skip ci] * [comment audit] Clarify push registration and dictation cleanup constraints [skip ci] * [comment audit] Condense keyboard geometry and native media ownership rationale [skip ci] * [comment audit] Tighten mobile chat scroll and composer concurrency rationale [skip ci] * [comment audit] Condense mobile reply compatibility and upload ownership rationale [skip ci] * [comment audit] Condense optimistic echo and scroll ownership rationale [skip ci] * [comment audit] Tighten stream replay and queued session ownership rationale [skip ci] * [comment audit] Condense mobile composer and reply-schema constraints [skip ci] * [comment audit] Clarify mobile transcript recovery and session ownership [skip ci] * [comment audit] Clarify mobile queue and source-control compatibility [skip ci] * [comment audit] Condense storage and task launch constraints [skip ci] * [comment audit] Clarify task schemas and terminal document ownership [skip ci] * [comment audit] Tighten terminal input and viewport rationale [skip ci] * [comment audit] Shorten terminal and RPC recorder contracts [skip ci] * [comment audit] Condense recorder engine and connection contracts [skip ci] * [comment audit] Shorten host credential and relay recovery comments [skip ci] * [comment audit] Tighten pairing recovery and bundle transport rationale [skip ci] * [comment audit] Clarify RPC delivery and workspace catalog boundaries [skip ci] * [comment audit] Condense catalog and relay entry contracts [skip ci] * [comment audit] Shorten shutdown and SSH relay delivery contracts [skip ci] * [comment audit] Condense WSL relay and E2E regression rationale [skip ci] * [comment audit] Shorten cross-version harness and renderer fixture explanations [skip ci] * [comment audit] Condense paired-host and E2E lifecycle rationale [skip ci] * [comment audit] Shorten layout oracle and regression explanations [skip ci] * [comment audit] Condense paired recovery and ownership regression contracts [skip ci] * [comment audit] Shorten restart, sidebar and SSH lifecycle contracts [skip ci] * [comment audit] Condense terminal rendering and IME regression rationale [skip ci] * [comment audit] Shorten terminal recovery and benchmark contracts [skip ci] * [comment audit] Condense tooling and Windows lifecycle proof rationale [skip ci] * [comment audit] Condense workflow routing and release rationale [skip ci] * [comment audit] Condense mobile security and installer contracts [skip ci] * [comment audit] Shorten native rationale and stylesheet workarounds [skip ci] * [comment audit] Shorten Windows visibility probe rationale [skip ci] * [comment audit] Condense embedded release and signing rationale [skip ci] * [comment audit] Retain current main test behavior in final reconciliation [skip ci] * [comment audit] Complete final comment review across current source inventory * [comment audit] Handle consolidated audit reports before final CI * [comment audit] Preserve credential storage census detail [skip ci] * [comment audit] Scale broad changed E2E selections with verified timing shards * [comment audit] Align E2E assertions with browser close and settled session metadata * [comment audit] Match existing E2Es to current resource and windowing contracts * [comment audit] Observe the shared server outage notice in reconnect coverage * [comment audit] Make existing renderer probes measure settled tab and PTY work * [comment audit] Align palette E2E selector with task search * [comment audit] Refresh remaining palette search selectors * [comment audit] Keep selector correction within selected audit specs * [comment audit] Await emoji fixture settings inside renderer evaluation * [comment audit] Cancel fixture fit retries between terminal tests --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
357 lines
14 KiB
TypeScript
357 lines
14 KiB
TypeScript
// Assert tab management through rendered DOM: setup/store writes alone previously passed despite render crashes (#1186/#1193).
|
|
// Hidden-window drag setup may use production store actions, but final selection/order/count assertions still read DOM.
|
|
|
|
import { rm } from 'node:fs/promises'
|
|
import type { Page } from '@stablyai/playwright-test'
|
|
import { test, expect } from './helpers/orca-app'
|
|
import {
|
|
waitForSessionReady,
|
|
waitForActiveWorktree,
|
|
getActiveWorktreeId,
|
|
getActiveTabId,
|
|
getActiveTabType,
|
|
getWorktreeTabs,
|
|
getTabBarOrder,
|
|
ensureTerminalVisible,
|
|
waitForStartupWorktreeRefresh
|
|
} from './helpers/store'
|
|
|
|
const SORTABLE_TAB = '[data-testid="sortable-tab"]'
|
|
|
|
function tabLocator(page: Page, tabId: string) {
|
|
return page.locator(`${SORTABLE_TAB}[data-tab-id="${tabId}"]`).first()
|
|
}
|
|
|
|
async function closeTabFromTabBar(page: Page, tabId: string): Promise<void> {
|
|
const tab = tabLocator(page, tabId)
|
|
await tab.hover()
|
|
await tab.getByRole('button', { name: /^Close tab /i }).click()
|
|
const confirmation = page.getByRole('dialog', { name: 'Stop running command?' })
|
|
// A shell still starting under load may require the running-command confirmation.
|
|
await expect
|
|
.poll(async () => (await confirmation.isVisible()) || (await tab.count()) === 0, {
|
|
timeout: 5_000
|
|
})
|
|
.toBe(true)
|
|
if (await confirmation.isVisible()) {
|
|
await confirmation.getByRole('button', { name: 'Stop and Close', exact: true }).click()
|
|
}
|
|
}
|
|
|
|
/** Count rendered tabs in the tab bar (user-visible, not store-level). */
|
|
async function countRenderedTabs(page: Page): Promise<number> {
|
|
return page.locator(SORTABLE_TAB).count()
|
|
}
|
|
|
|
// Read DOM data-active so a correct store id cannot hide a broken rendered selection indicator.
|
|
async function getDomActiveTabId(page: Page): Promise<string | null> {
|
|
return page.evaluate((selector) => {
|
|
const match = document.querySelector(`${selector}[data-active="true"]`)
|
|
return match?.getAttribute('data-tab-id') ?? null
|
|
}, SORTABLE_TAB)
|
|
}
|
|
|
|
async function getFocusedTerminalTabId(page: Page): Promise<string | null> {
|
|
return page.evaluate(() => {
|
|
const active = document.activeElement
|
|
if (!(active instanceof HTMLElement) || !active.classList.contains('xterm-helper-textarea')) {
|
|
return null
|
|
}
|
|
return active.closest('[data-terminal-tab-id]')?.getAttribute('data-terminal-tab-id') ?? null
|
|
})
|
|
}
|
|
|
|
test.describe('Tabs', () => {
|
|
test.beforeEach(async ({ orcaPage }) => {
|
|
await waitForSessionReady(orcaPage)
|
|
await waitForStartupWorktreeRefresh(orcaPage)
|
|
await waitForActiveWorktree(orcaPage)
|
|
await ensureTerminalVisible(orcaPage)
|
|
const initialTabId = (await getActiveTabId(orcaPage))!
|
|
await expect(tabLocator(orcaPage, initialTabId)).toBeVisible()
|
|
})
|
|
|
|
// Use the real + → New Terminal flow and require a new rendered tab.
|
|
test('clicking "+" then "New Terminal" creates a new terminal tab', async ({ orcaPage }) => {
|
|
const tabsBefore = await countRenderedTabs(orcaPage)
|
|
|
|
// Hidden animated terminals can invalidate Playwright stability despite an enabled visible button.
|
|
await orcaPage.getByRole('button', { name: 'New tab' }).click({ force: true })
|
|
const newTerminalMenuItem = orcaPage.getByRole('menuitem', { name: /New Terminal/i }).first()
|
|
await newTerminalMenuItem.click()
|
|
await expect(newTerminalMenuItem).toBeHidden({ timeout: 3_000 })
|
|
|
|
await expect
|
|
.poll(() => countRenderedTabs(orcaPage), {
|
|
timeout: 5_000,
|
|
message: 'Clicking + → New Terminal did not render a new tab in the tab bar'
|
|
})
|
|
.toBeGreaterThan(tabsBefore)
|
|
|
|
const activeType = await getActiveTabType(orcaPage)
|
|
expect(activeType).toBe('terminal')
|
|
|
|
const storeActiveId = await getActiveTabId(orcaPage)
|
|
expect(storeActiveId).not.toBeNull()
|
|
await expect(tabLocator(orcaPage, storeActiveId!)).toBeVisible()
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(storeActiveId)
|
|
await expect
|
|
.poll(() => getFocusedTerminalTabId(orcaPage), {
|
|
timeout: 5_000,
|
|
message: 'Menu-created terminal tab did not receive keyboard focus'
|
|
})
|
|
.toBe(storeActiveId)
|
|
})
|
|
|
|
test('clicking "+" then "New Markdown" focuses the editor', async ({
|
|
orcaPage,
|
|
registerPostElectronShutdownCleanup
|
|
}) => {
|
|
let createdFilePath: string | null = null
|
|
registerPostElectronShutdownCleanup(async () => {
|
|
if (createdFilePath) {
|
|
await rm(createdFilePath, { force: true })
|
|
}
|
|
})
|
|
|
|
const preExistingFileIds = await orcaPage.evaluate(
|
|
() => window.__store?.getState().openFiles.map((file) => file.id) ?? []
|
|
)
|
|
|
|
await orcaPage.getByRole('button', { name: 'New tab' }).click({ force: true })
|
|
const newMarkdownMenuItem = orcaPage.getByRole('menuitem', { name: /New Markdown/i }).first()
|
|
await newMarkdownMenuItem.click()
|
|
|
|
// Require a newly minted id and retain its cleanup path so existing Markdown cannot satisfy or be deleted by this test.
|
|
const createdFileHandle = await orcaPage.waitForFunction(
|
|
(knownFileIds) => {
|
|
const state = window.__store?.getState()
|
|
const file = state?.openFiles.find((candidate) => candidate.id === state.activeFileId)
|
|
if (!file || knownFileIds.includes(file.id)) {
|
|
return null
|
|
}
|
|
return { id: file.id, filePath: file.filePath }
|
|
},
|
|
preExistingFileIds,
|
|
{ timeout: 25_000 }
|
|
)
|
|
const createdFile = (await createdFileHandle.jsonValue())!
|
|
createdFilePath = createdFile.filePath
|
|
|
|
const editor = orcaPage.locator('.rich-markdown-editor')
|
|
await expect(editor).toBeVisible({ timeout: 25_000 })
|
|
await expect(newMarkdownMenuItem).toBeHidden({ timeout: 3_000 })
|
|
|
|
await expect
|
|
.poll(() => editor.evaluate((element) => document.activeElement === element), {
|
|
timeout: 5_000,
|
|
message: 'Menu-created Markdown editor did not receive keyboard focus'
|
|
})
|
|
.toBe(true)
|
|
|
|
const sentinel = `autofocus-${Date.now()}`
|
|
// Why: typing through the page keyboard proves focus landed without an editor click.
|
|
await orcaPage.keyboard.type(sentinel)
|
|
await expect(editor).toContainText(sentinel)
|
|
|
|
await orcaPage.evaluate((fileId) => {
|
|
window.__store?.getState().closeFile(fileId)
|
|
}, createdFile.id)
|
|
await expect(editor).toBeHidden()
|
|
})
|
|
|
|
test('Cmd/Ctrl+T creates a new terminal tab', async ({ orcaPage }) => {
|
|
const isMac = process.platform === 'darwin'
|
|
const mod = isMac ? 'Meta' : 'Control'
|
|
const tabsBefore = await countRenderedTabs(orcaPage)
|
|
|
|
// Focus body so stale search inputs cannot consume the window shortcut.
|
|
await orcaPage.evaluate(() => document.body.focus())
|
|
await orcaPage.keyboard.press(`${mod}+t`)
|
|
|
|
await expect
|
|
.poll(() => countRenderedTabs(orcaPage), {
|
|
timeout: 5_000,
|
|
message: `${mod}+T did not add a tab to the tab bar`
|
|
})
|
|
.toBe(tabsBefore + 1)
|
|
|
|
// Use the store only to distinguish surface type; DOM must independently prove one active tab.
|
|
const activeType = await getActiveTabType(orcaPage)
|
|
expect(activeType).toBe('terminal')
|
|
|
|
// Require exactly one DOM-active tab matching store selection.
|
|
const storeActiveId = await getActiveTabId(orcaPage)
|
|
expect(storeActiveId).not.toBeNull()
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(storeActiveId)
|
|
})
|
|
|
|
test('clicking tabs still switches after dragging a terminal tab to reorder', async ({
|
|
orcaPage
|
|
}) => {
|
|
const worktreeId = (await getActiveWorktreeId(orcaPage))!
|
|
|
|
await orcaPage.evaluate((targetWorktreeId) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
return
|
|
}
|
|
const state = store.getState()
|
|
const existing = (state.tabsByWorktree[targetWorktreeId] ?? []).length
|
|
for (let i = existing; i < 2; i++) {
|
|
state.createTab(targetWorktreeId)
|
|
}
|
|
}, worktreeId)
|
|
await expect
|
|
.poll(() => countRenderedTabs(orcaPage), { timeout: 5_000 })
|
|
.toBeGreaterThanOrEqual(2)
|
|
|
|
const domOrderBefore = await orcaPage.$$eval(SORTABLE_TAB, (nodes) =>
|
|
nodes.map((n) => (n as HTMLElement).dataset.tabId ?? '')
|
|
)
|
|
const [firstTabId, secondTabId] = domOrderBefore
|
|
expect(firstTabId).toBeTruthy()
|
|
expect(secondTabId).toBeTruthy()
|
|
|
|
await tabLocator(orcaPage, firstTabId).click({ force: true })
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(firstTabId)
|
|
|
|
const firstTabBox = await tabLocator(orcaPage, firstTabId).boundingBox()
|
|
const secondTabBox = await tabLocator(orcaPage, secondTabId).boundingBox()
|
|
expect(firstTabBox).not.toBeNull()
|
|
expect(secondTabBox).not.toBeNull()
|
|
const startX = firstTabBox!.x + firstTabBox!.width / 2
|
|
const startY = firstTabBox!.y + firstTabBox!.height / 2
|
|
const endX = secondTabBox!.x + secondTabBox!.width * 0.75
|
|
const endY = secondTabBox!.y + secondTabBox!.height / 2
|
|
await orcaPage.mouse.move(startX, startY)
|
|
await orcaPage.mouse.down()
|
|
// Drag far enough for dnd-kit to reorder, then release over the strip before selecting again.
|
|
await orcaPage.mouse.move(endX, endY, { steps: 8 })
|
|
await orcaPage.mouse.up()
|
|
|
|
await expect
|
|
.poll(
|
|
async () =>
|
|
orcaPage.$$eval(SORTABLE_TAB, (nodes) =>
|
|
nodes.map((n) => (n as HTMLElement).dataset.tabId ?? '')
|
|
),
|
|
{ timeout: 5_000, message: 'Terminal tab drag did not reorder the tab strip' }
|
|
)
|
|
.toEqual([secondTabId, firstTabId, ...domOrderBefore.slice(2)])
|
|
|
|
await tabLocator(orcaPage, firstTabId).click({ force: true })
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(firstTabId)
|
|
await tabLocator(orcaPage, secondTabId).click({ force: true })
|
|
await expect
|
|
.poll(() => getDomActiveTabId(orcaPage), {
|
|
timeout: 5_000,
|
|
message: 'Tab click did not activate after a terminal tab reorder drag'
|
|
})
|
|
.toBe(secondTabId)
|
|
})
|
|
|
|
// After reorder, Cmd/Ctrl+Shift+[ must follow the visible group order, not stale tabBarOrderByWorktree.
|
|
// Require DOM data-active to follow each expected tab as well as store selection.
|
|
test('Cmd/Ctrl+Shift+[ walks tabs in drag-reordered order', async ({ orcaPage }) => {
|
|
const isMac = process.platform === 'darwin'
|
|
const mod = isMac ? 'Meta' : 'Control'
|
|
const worktreeId = (await getActiveWorktreeId(orcaPage))!
|
|
|
|
// Seed at least three tabs directly; separate tests exercise + creation.
|
|
await orcaPage.evaluate((targetWorktreeId) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
return
|
|
}
|
|
const state = store.getState()
|
|
const existing = (state.tabsByWorktree[targetWorktreeId] ?? []).length
|
|
for (let i = existing; i < 3; i++) {
|
|
state.createTab(targetWorktreeId)
|
|
}
|
|
}, worktreeId)
|
|
await expect
|
|
.poll(async () => (await getWorktreeTabs(orcaPage, worktreeId)).length, {
|
|
timeout: 5_000
|
|
})
|
|
.toBeGreaterThanOrEqual(3)
|
|
|
|
const initialOrder = await getTabBarOrder(orcaPage, worktreeId)
|
|
expect(initialOrder.length).toBeGreaterThanOrEqual(3)
|
|
const [a, b, c] = initialOrder
|
|
|
|
// Use the production drag/drop store action to move first to last.
|
|
await orcaPage.evaluate((targetWorktreeId) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
return
|
|
}
|
|
const state = store.getState()
|
|
const groups = state.groupsByWorktree[targetWorktreeId] ?? []
|
|
const activeGroupId = state.activeGroupIdByWorktree[targetWorktreeId]
|
|
const activeGroup = activeGroupId
|
|
? groups.find((group) => group.id === activeGroupId)
|
|
: groups[0]
|
|
if (!activeGroup) {
|
|
return
|
|
}
|
|
const [first, ...rest] = activeGroup.tabOrder
|
|
state.reorderUnifiedTabs(activeGroup.id, [...rest, first])
|
|
}, worktreeId)
|
|
await expect
|
|
.poll(async () => getTabBarOrder(orcaPage, worktreeId), {
|
|
timeout: 3_000
|
|
})
|
|
.toEqual([b, c, a])
|
|
|
|
// Activate the last tab in the new visible order, then walk left twice.
|
|
// Expected cycle: a → c → b (i.e. walks the *new* order in reverse).
|
|
await orcaPage.evaluate((tabId) => {
|
|
window.__store?.getState().setActiveTab(tabId)
|
|
}, a)
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(a)
|
|
|
|
await orcaPage.keyboard.press(`${mod}+Shift+BracketLeft`)
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(c)
|
|
await expect(tabLocator(orcaPage, c)).toHaveAttribute('data-active', 'true')
|
|
|
|
await orcaPage.keyboard.press(`${mod}+Shift+BracketLeft`)
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 3_000 }).toBe(b)
|
|
await expect(tabLocator(orcaPage, b)).toHaveAttribute('data-active', 'true')
|
|
})
|
|
|
|
// Click the real X and require DOM removal so store-only close cannot hide a stuck tab.
|
|
test('closing the active tab removes it and activates a neighbor', async ({ orcaPage }) => {
|
|
const worktreeId = (await getActiveWorktreeId(orcaPage))!
|
|
|
|
// Need a second tab so we can close one without deactivating the worktree.
|
|
await orcaPage.evaluate((targetWorktreeId) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
return
|
|
}
|
|
const state = store.getState()
|
|
if ((state.tabsByWorktree[targetWorktreeId] ?? []).length < 2) {
|
|
state.createTab(targetWorktreeId)
|
|
}
|
|
}, worktreeId)
|
|
await expect
|
|
.poll(() => countRenderedTabs(orcaPage), { timeout: 5_000 })
|
|
.toBeGreaterThanOrEqual(2)
|
|
|
|
const tabsBefore = await countRenderedTabs(orcaPage)
|
|
const activeId = await getActiveTabId(orcaPage)
|
|
expect(activeId).not.toBeNull()
|
|
await closeTabFromTabBar(orcaPage, activeId!)
|
|
|
|
await expect
|
|
.poll(() => countRenderedTabs(orcaPage), {
|
|
timeout: 5_000,
|
|
message: 'Clicking close did not remove the tab element from the DOM'
|
|
})
|
|
.toBe(tabsBefore - 1)
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 5_000 }).not.toBe(activeId)
|
|
await expect.poll(() => getDomActiveTabId(orcaPage), { timeout: 5_000 }).not.toBeNull()
|
|
})
|
|
})
|