* Fix blank terminal after split operations and add visual tests ## Blank Terminal Fix - Add `needsRefreshAfterWindowChange` flag in GhosttyTerminalView - Force terminal refresh when view is added to window, even if size unchanged - Add `ghostty_surface_refresh()` call in attachToView for same-view reattachment - Add debug logging for surface attachment lifecycle (DEBUG builds only) ## Bonsplit Migration - Add bonsplit as local Swift package (vendor/bonsplit submodule) - Replace custom SplitTree with BonsplitController - Add Panel protocol with TerminalPanel and BrowserPanel implementations - Add SidebarTab as main tab container with BonsplitController - Remove old Splits/ directory (SplitTree, SplitView, TerminalSplitTreeView) ## Visual Screenshot Tests - Add test_visual_screenshots.py for automated visual regression testing - Uses in-app screenshot API (CGWindowListCreateImage) - no screen recording needed - Generates HTML report with before/after comparisons - Tests: splits, browser panels, focus switching, close operations, rapid cycles - Includes annotation fields for easy feedback ## Browser Shortcut (⌘⇧B) - Add keyboard shortcut to open browser panel in current pane - Add openBrowser() method to TabManager - Add shortcut configuration in KeyboardShortcutSettings ## Screenshot Command - Add 'screenshot' command to TerminalController for in-app window capture - Returns OK with screenshot ID and path ## Other - Add tests/visual_output/ and tests/visual_report.html to .gitignore * Add browser title subscription and set tab height to 30px - Subscribe to BrowserPanel.$pageTitle changes to update bonsplit tabs - Update tab titles in real-time as page navigation occurs - Clean up subscriptions when panels are removed - Set bonsplit tab bar and tab height to 30px (in submodule) * Fix socket API regressions in list_surfaces, list_bonsplit_tabs, focus_pane - list_surfaces: Remove [terminal]/[browser] suffix to keep UUID-only format that clients and tests expect for parsing - list_bonsplit_tabs --pane: Properly look up pane by UUID instead of creating a new PaneID (requires bonsplit PaneID.id to be public) - focus_pane: Accept both UUID strings and integer indices as documented * Fix browser panel stability and keyboard shortcuts - Prevent WKWebView focus lifecycle crashes during split/view reshuffles - Match bracket shortcuts via keyCode (Cmd+Shift+[ / ], Cmd+Ctrl+[ / ]) - Support Ghostty config goto_split:* keybinds when WebView is focused - Add focus_webview/is_webview_focused socket commands and regression tests - Rename SidebarTab to Workspace and update docs * Make ctrl+enter keybind test skippable Skip when the Ghostty keybind isn't configured or when osascript can't send keystrokes (no Accessibility permission), so VM runs stay green. * Auto-focus browser omnibar when blank When a browser surface is focused but no URL is loaded yet, focus the address bar instead of the WKWebView. * Stabilize socket surface indexing * Focus browser omnibar escape; add webview keybind UI tests - Escape in omnibar now returns focus to WKWebView\n- Add UI tests for Cmd+Ctrl+H pane navigation with WebKit focused (including Ghostty config)\n- Avoid flaky element screenshots in UpdatePillUITests on the UTM VM * Fix browser drag-to-split blanks and socket parsing * Fix webview-focused shortcuts and stabilize browser splits - Match ctrl/shift shortcuts by keyCode where needed (Ctrl+H, bracket keys) - Load Ghostty goto_split triggers reliably and refresh on config load - Add debug socket helpers: set_shortcut + simulate_shortcut for tests - Convert browser goto_split/keybind tests to socket-based injection (no osascript) - Bump bonsplit for drag-to-split fixes * Fix split layout collapse and harden socket pane APIs * Stabilize OSC 99 notification test timing * Fix terminal focus routing after split reparent * Support simulate_shortcut enter for focus routing test * Stabilize terminal focus routing test * Fix frozen new terminal tabs after many splits * Fix frozen new terminal tabs after splits * Fix terminal freeze on launch/new tabs * Update ghostty submodule * Fix terminal focus/render stalls after split churn * Fix nested split collapsing existing pane * Fix nested split collapse + stabilize new-surface focus * Update bonsplit submodule * Fix SIGINT test flake * Remove bonsplit tab-switch crossfade * Remove PROJECTS.md * Remove bonsplit tab selection animation * Ignore generated test reports * Middle click closes tab * Revert unintended .gitignore change * Fix build after main merge * Revert "Fix build after main merge" This reverts commit 16bf9816d0856b5385d52f886aa5eb50f3c9d9a4. * Revert "Merge remote-tracking branch 'origin/main' into fix/blank-terminal-and-visual-tests" This reverts commit 7c20fb53fd71fea7a19a3673f2dd73e5f0c783c4, reversing changes made to 0aff107d787bc9d8bbc28220090b4ca7af72e040. * Remove tab close fade animation * Use terminal.fill icon * Make terminal tab icon smaller * Match browser globe tab icon size * Bonsplit: tab min width 48 and tighter close button * Bonsplit: smaller tab title font * Show unread notification badge in bonsplit tabs and improve UI polish Sync unread notification state to bonsplit tab badges (blue dot). Improve EmptyPanelView with Terminal/Browser buttons and shortcut hints. Add tooltips to close tab button and search overlay buttons. * Fix reload.sh single-instance safety check on macOS Replace GNU-only `ps -o etimes=` with portable `ps -o etime=` and parse the dd-hh:mm:ss format manually for macOS compatibility. * Centralize keyboard shortcut definitions into Action enum Replace per-shortcut boilerplate with a single Action enum that holds the label, defaults key, and default binding for each shortcut. All call sites now use shortcut(for:). Settings UI is data-driven via ForEach(Action.allCases). Titlebar tooltips update dynamically when shortcuts are changed. Remove duplicate .keyboardShortcut() modifiers from menu items that are already handled by the event monitor. * Fix WKWebView consuming app menu shortcuts and close panel confirmation Add CmuxWebView subclass that routes key equivalents through the main menu before WebKit, so Cmd+N/Cmd+W/tab switching work when a browser pane is focused. Fix Cmd+W close-panel path: bypass Bonsplit delegate gating after the user confirms the running-process dialog by tracking forceCloseTabIds. Add unit tests (CmuxWebViewKeyEquivalentTests) and UI test scaffolding (MenuKeyEquivalentRoutingUITests) with a new cmux-unit Xcode scheme. * Update CLAUDE.md and PROJECTS.md with recent changes CLAUDE.md: enforce --tag for reload commands, add cleanup safety rules. PROJECTS.md: log notification badge, reload.sh fix, Cmd+W fix, WebView key equiv fix, and centralized shortcuts work. * Keep selection index stable on close * Add concepts page documenting terminology hierarchy New docs page explaining Window > Workspace > Pane > Surface > Panel hierarchy with aligned ASCII diagram. Updated tabs.mdx and splits.mdx to use consistent terminology (workspace instead of tab, surface instead of panel) and corrected outdated CLI command references. * Update bonsplit submodule * WIP: improve split close stability and UI regressions * Close terminal panel on child exit; hide terminal dirty dot * Fix split close/focus regressions and stabilize UI tests * Add unread Dock/Cmd+Tab badge with settings toggle * Fix browser-surface shortcuts and Cmd+L browser opening * Snapshot current workspace state before regression fixes * Update bonsplit submodule snapshot * Stabilize split-close regression capture and sidebar resize assertions * Change default Show Notifications shortcut from Cmd+Shift+I to Cmd+I * Fix update check readiness race, enable release update logging, and improve checking spinner * Restore terminal file drop, fix browser omnibar click focus, and add panel workspace ID mutation for surface moves * Add Cmd+digit workspace hints, titlebar shortcut pills, sidebar drag-reorder, and workspace placement settings * Add v2 browser automation API, surface move/reorder commands, and short-handle ref system to TerminalController * Add CLI browser command surface, --id-format flag, and move/reorder commands * Extend test clients with move/reorder APIs, ref-handle support, and increased timeouts * Harden test runner scripts with deterministic builds, retry logic, and robust socket readiness * Stabilize existing test suites with focus-wait helpers, increased timeouts, and API shape updates * Add terminal file drop e2e regression test * Add v2 browser API, CLI ref resolution, and surface move/reorder test suites * Add unit tests for shortcut hints, workspace reorder, drop planner, and update UI test stabilization * Add cmux-debug-windows skill with snapshot script and agent config * Update project docs: mark browser parity and move/reorder phases complete, add parallel agent workflow guidelines * Update bonsplit submodule: re-entrant setPosition guard, tab shortcut hints, and moveTab/reorderTab API * Add browser agent UX improvements: snapshot refs, placement reuse, diagnostics, and skill docs - Upgrade browser.snapshot to emit accessibility tree text with element refs (eN) - Add right-sibling pane reuse policy for browser.open_split placement - Add rich not_found diagnostics with retry logic for selector actions - Support --snapshot-after for post-action verification on mutating commands - Allow browser fill with empty text for clearing inputs - Default CLI --id-format to refs-first (UUIDs opt-in via --id-format uuids|both) - Format legacy new-pane/new-surface output with short surface refs - Add skills/cmuxterm-browser/ and skills/cmuxterm/ end-user skill docs - Add regression tests for placement policy, snapshot refs, diagnostics, and ID defaults * Update bonsplit submodule: keep raster favicons in color when inactive
630 lines
33 KiB
Swift
630 lines
33 KiB
Swift
import XCTest
|
|
import Foundation
|
|
|
|
final class CloseWorkspaceCmdDUITests: XCTestCase {
|
|
override func setUp() {
|
|
super.setUp()
|
|
continueAfterFailure = false
|
|
}
|
|
|
|
func testCmdDConfirmsCloseWhenClosingLastWorkspaceClosesWindow() {
|
|
let app = XCUIApplication()
|
|
// Force a confirmation alert when closing the current workspace so we can validate Cmd+D.
|
|
app.launchEnvironment["CMUX_UI_TEST_FORCE_CONFIRM_CLOSE_WORKSPACE"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
|
|
// Close current workspace. With a single workspace/window, this will close the window after confirmation.
|
|
app.typeKey("w", modifierFlags: [.command, .shift])
|
|
XCTAssertTrue(waitForCloseWorkspaceAlert(app: app, timeout: 5.0))
|
|
|
|
// Cmd+D should accept the destructive close and close the window.
|
|
app.typeKey("d", modifierFlags: [.command])
|
|
|
|
XCTAssertTrue(
|
|
waitForNoWindowsOrAppNotRunningForeground(app: app, timeout: 6.0),
|
|
"Expected Cmd+D to confirm close and close the last window"
|
|
)
|
|
}
|
|
|
|
func testCmdDConfirmsCloseWhenClosingLastTabClosesWindow() {
|
|
let app = XCUIApplication()
|
|
// Closing the last tab should also present a confirmation and accept Cmd+D when it would close the window.
|
|
app.launchEnvironment["CMUX_UI_TEST_FORCE_CONFIRM_CLOSE_WORKSPACE"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
|
|
// Close current tab (Cmd+W). With a single workspace and a single tab, this will close the window after confirmation.
|
|
app.typeKey("w", modifierFlags: [.command])
|
|
XCTAssertTrue(waitForCloseTabAlert(app: app, timeout: 5.0))
|
|
|
|
// Cmd+D should accept the destructive close and close the window.
|
|
app.typeKey("d", modifierFlags: [.command])
|
|
|
|
XCTAssertTrue(
|
|
waitForNoWindowsOrAppNotRunningForeground(app: app, timeout: 6.0),
|
|
"Expected Cmd+D to confirm close and close the last window"
|
|
)
|
|
}
|
|
|
|
func testCmdNOpensNewWindowWhenNoWindowsOpen() {
|
|
let app = XCUIApplication()
|
|
app.launchEnvironment["CMUX_UI_TEST_FORCE_CONFIRM_CLOSE_WORKSPACE"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
|
|
// Close the only window.
|
|
app.typeKey("w", modifierFlags: [.command, .shift])
|
|
XCTAssertTrue(waitForCloseWorkspaceAlert(app: app, timeout: 5.0))
|
|
app.typeKey("d", modifierFlags: [.command])
|
|
|
|
XCTAssertTrue(
|
|
waitForWindowCount(app: app, toBe: 0, timeout: 6.0),
|
|
"Expected last window to close"
|
|
)
|
|
|
|
// Cmd+N should create a new window when there are no windows.
|
|
app.activate()
|
|
app.typeKey("n", modifierFlags: [.command])
|
|
|
|
XCTAssertTrue(
|
|
waitForWindowCount(app: app, atLeast: 1, timeout: 6.0),
|
|
"Expected Cmd+N to open a new window when no windows are open"
|
|
)
|
|
}
|
|
|
|
func testChildExitInHorizontalSplitClosesOnlyExitedPane() {
|
|
let attempts = 8
|
|
for attempt in 1...attempts {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-split-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_LAYOUT"] = "lr"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_EXPECTED_PANELS_AFTER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_AUTO_TRIGGER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_STRICT"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
defer { app.terminate() }
|
|
|
|
XCTAssertTrue(waitForAnyJSON(atPath: dataPath, timeout: 12.0), "Attempt \(attempt): expected child-exit test data at \(dataPath)")
|
|
guard let data = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for done=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = data["setupError"], !setupError.isEmpty {
|
|
XCTFail("Attempt \(attempt): setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(data["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(data["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (data["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (data["timedOut"] ?? "") == "1"
|
|
|
|
XCTAssertFalse(timedOut, "Attempt \(attempt): timed out waiting for child-exit close. data=\(data)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Attempt \(attempt): expected workspace to remain open. data=\(data)")
|
|
XCTAssertEqual(panelCountAfter, 1, "Attempt \(attempt): expected only exited pane to close. data=\(data)")
|
|
XCTAssertFalse(closedWorkspace, "Attempt \(attempt): expected workspace/window to stay open. data=\(data)")
|
|
}
|
|
}
|
|
|
|
func testCtrlDFromKeyboardInHorizontalSplitClosesOnlyFocusedPane() {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-keyboard-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launch()
|
|
app.activate()
|
|
|
|
XCTAssertTrue(waitForAnyJSON(atPath: dataPath, timeout: 12.0), "Expected keyboard child-exit setup data at \(dataPath)")
|
|
guard let ready = waitForJSONKey("ready", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Timed out waiting for ready=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = ready["setupError"], !setupError.isEmpty {
|
|
XCTFail("Setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let rightPanelId = ready["rightPanelId"] ?? ""
|
|
XCTAssertEqual(ready["focusedPanelBefore"], rightPanelId, "Expected right split to be the focused panel before Ctrl+D. data=\(ready)")
|
|
XCTAssertEqual(ready["firstResponderPanelBefore"], rightPanelId, "Expected AppKit first responder to match right split before Ctrl+D. data=\(ready)")
|
|
|
|
// Exercise the real keyboard path (same path as user typing Ctrl+D), not an in-process helper.
|
|
app.activate()
|
|
app.typeKey("d", modifierFlags: [.control])
|
|
|
|
guard let done = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 10.0) else {
|
|
XCTFail("Timed out waiting for done=1 after Ctrl+D. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(done["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(done["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (done["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (done["timedOut"] ?? "") == "1"
|
|
let focusedPanelAfter = done["focusedPanelAfter"] ?? ""
|
|
let firstResponderPanelAfter = done["firstResponderPanelAfter"] ?? ""
|
|
|
|
XCTAssertFalse(timedOut, "Keyboard Ctrl+D test timed out. data=\(done)")
|
|
XCTAssertFalse(closedWorkspace, "Ctrl+D should not close workspace/window when another pane remains. data=\(done)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Expected workspace to remain open after Ctrl+D in split. data=\(done)")
|
|
XCTAssertEqual(panelCountAfter, 1, "Expected only exited pane to close after Ctrl+D in split. data=\(done)")
|
|
if !focusedPanelAfter.isEmpty || !firstResponderPanelAfter.isEmpty {
|
|
XCTAssertEqual(
|
|
firstResponderPanelAfter,
|
|
focusedPanelAfter,
|
|
"Expected first responder and focused panel to converge after Ctrl+D. data=\(done)"
|
|
)
|
|
}
|
|
}
|
|
|
|
func testCtrlDFromKeyboardInThreePaneLayoutClosesOnlyFocusedPane() {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-keyboard-tree-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_LAYOUT"] = "lr_left_vertical"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_EXPECTED_PANELS_AFTER"] = "2"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_AUTO_TRIGGER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_STRICT"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
|
|
XCTAssertTrue(waitForAnyJSON(atPath: dataPath, timeout: 12.0), "Expected keyboard child-exit setup data at \(dataPath)")
|
|
guard let ready = waitForJSONKey("ready", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Timed out waiting for ready=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = ready["setupError"], !setupError.isEmpty {
|
|
XCTFail("Setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let rightPanelId = ready["rightPanelId"] ?? ""
|
|
XCTAssertEqual(ready["focusedPanelBefore"], rightPanelId, "Expected right split to be focused before Ctrl+D. data=\(ready)")
|
|
XCTAssertEqual(ready["firstResponderPanelBefore"], rightPanelId, "Expected first responder to match right split before Ctrl+D. data=\(ready)")
|
|
guard let done = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 10.0) else {
|
|
XCTFail("Timed out waiting for done=1 after Ctrl+D. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(done["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(done["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (done["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (done["timedOut"] ?? "") == "1"
|
|
let focusedPanelAfter = done["focusedPanelAfter"] ?? ""
|
|
let firstResponderPanelAfter = done["firstResponderPanelAfter"] ?? ""
|
|
|
|
XCTAssertFalse(timedOut, "Keyboard Ctrl+D test timed out. data=\(done)")
|
|
XCTAssertFalse(closedWorkspace, "Ctrl+D should not close workspace/window when multiple panes remain. data=\(done)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Expected workspace to remain open after Ctrl+D in three-pane layout. data=\(done)")
|
|
XCTAssertEqual(panelCountAfter, 2, "Expected only focused exited pane to close in three-pane layout. data=\(done)")
|
|
if !focusedPanelAfter.isEmpty || !firstResponderPanelAfter.isEmpty {
|
|
XCTAssertEqual(
|
|
firstResponderPanelAfter,
|
|
focusedPanelAfter,
|
|
"Expected first responder and focused panel to converge after Ctrl+D in three-pane layout. data=\(done)"
|
|
)
|
|
}
|
|
}
|
|
|
|
func testCtrlDAfterClosingRightColumnIn2x2KeepsWorkspaceOpen() {
|
|
// This regression can be timing-sensitive; run several fresh launches to catch
|
|
// any single bad close routing/focus cycle.
|
|
let attempts = 8
|
|
for attempt in 1...attempts {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-keyboard-2x2-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_LAYOUT"] = "lrtd_close_right_then_exit_top_left"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_EXPECTED_PANELS_AFTER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_AUTO_TRIGGER"] = "0"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_STRICT"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
defer { app.terminate() }
|
|
|
|
XCTAssertTrue(
|
|
waitForAnyJSON(atPath: dataPath, timeout: 12.0),
|
|
"Attempt \(attempt): expected keyboard child-exit setup data at \(dataPath)"
|
|
)
|
|
guard let ready = waitForJSONKey("ready", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for ready=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = ready["setupError"], !setupError.isEmpty {
|
|
XCTFail("Attempt \(attempt): setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let panelCountBefore = Int(ready["panelCountBeforeCtrlD"] ?? "") ?? -1
|
|
let exitPanelId = ready["exitPanelId"] ?? ""
|
|
XCTAssertEqual(
|
|
panelCountBefore,
|
|
2,
|
|
"Attempt \(attempt): expected two panels before Ctrl+D in 2x2-right-close repro. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["focusedPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected target exit pane to be focused before Ctrl+D. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["firstResponderPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected first responder to match target pane before Ctrl+D. data=\(ready)"
|
|
)
|
|
|
|
app.typeKey("d", modifierFlags: [.control])
|
|
|
|
guard let done = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 10.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for done=1 after Ctrl+D. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(done["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(done["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (done["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (done["timedOut"] ?? "") == "1"
|
|
let focusedPanelAfter = done["focusedPanelAfter"] ?? ""
|
|
let firstResponderPanelAfter = done["firstResponderPanelAfter"] ?? ""
|
|
let triggerMode = done["autoTriggerMode"] ?? ""
|
|
|
|
XCTAssertFalse(timedOut, "Attempt \(attempt): keyboard Ctrl+D 2x2-right-close timed out. data=\(done)")
|
|
XCTAssertNotEqual(triggerMode, "runtime_close_callback", "Attempt \(attempt): expected real keyboard child-exit path, not runtime callback shortcut. data=\(done)")
|
|
XCTAssertFalse(closedWorkspace, "Attempt \(attempt): Ctrl+D should not close workspace/window when another pane remains. data=\(done)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Attempt \(attempt): workspace should remain open after Ctrl+D. data=\(done)")
|
|
XCTAssertEqual(panelCountAfter, 1, "Attempt \(attempt): only focused pane should close after Ctrl+D. data=\(done)")
|
|
if !focusedPanelAfter.isEmpty || !firstResponderPanelAfter.isEmpty {
|
|
XCTAssertEqual(
|
|
firstResponderPanelAfter,
|
|
focusedPanelAfter,
|
|
"Attempt \(attempt): expected focus indicator and first responder to converge after Ctrl+D. data=\(done)"
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
func testCtrlDAfterClosingBottomRowIn2x2KeepsWorkspaceOpen() {
|
|
let attempts = 8
|
|
for attempt in 1...attempts {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-keyboard-2x2-bottom-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_LAYOUT"] = "tdlr_close_bottom_then_exit_top_left"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_EXPECTED_PANELS_AFTER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_AUTO_TRIGGER"] = "0"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_STRICT"] = "1"
|
|
app.launch()
|
|
app.activate()
|
|
defer { app.terminate() }
|
|
|
|
XCTAssertTrue(
|
|
waitForAnyJSON(atPath: dataPath, timeout: 12.0),
|
|
"Attempt \(attempt): expected keyboard child-exit setup data at \(dataPath)"
|
|
)
|
|
guard let ready = waitForJSONKey("ready", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for ready=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = ready["setupError"], !setupError.isEmpty {
|
|
XCTFail("Attempt \(attempt): setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let panelCountBefore = Int(ready["panelCountBeforeCtrlD"] ?? "") ?? -1
|
|
let exitPanelId = ready["exitPanelId"] ?? ""
|
|
XCTAssertEqual(
|
|
panelCountBefore,
|
|
2,
|
|
"Attempt \(attempt): expected two panels before Ctrl+D in 2x2-bottom-close repro. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["focusedPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected target exit pane to be focused before Ctrl+D. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["firstResponderPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected first responder to match target pane before Ctrl+D. data=\(ready)"
|
|
)
|
|
|
|
app.typeKey("d", modifierFlags: [.control])
|
|
|
|
guard let done = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 10.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for done=1 after Ctrl+D. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(done["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(done["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (done["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (done["timedOut"] ?? "") == "1"
|
|
let focusedPanelAfter = done["focusedPanelAfter"] ?? ""
|
|
let firstResponderPanelAfter = done["firstResponderPanelAfter"] ?? ""
|
|
let triggerMode = done["autoTriggerMode"] ?? ""
|
|
|
|
XCTAssertFalse(timedOut, "Attempt \(attempt): keyboard Ctrl+D 2x2-bottom-close timed out. data=\(done)")
|
|
XCTAssertNotEqual(triggerMode, "runtime_close_callback", "Attempt \(attempt): expected real keyboard child-exit path, not runtime callback shortcut. data=\(done)")
|
|
XCTAssertFalse(closedWorkspace, "Attempt \(attempt): Ctrl+D should not close workspace/window when another pane remains. data=\(done)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Attempt \(attempt): workspace should remain open after Ctrl+D. data=\(done)")
|
|
XCTAssertEqual(panelCountAfter, 1, "Attempt \(attempt): only focused pane should close after Ctrl+D. data=\(done)")
|
|
if !focusedPanelAfter.isEmpty || !firstResponderPanelAfter.isEmpty {
|
|
XCTAssertEqual(
|
|
firstResponderPanelAfter,
|
|
focusedPanelAfter,
|
|
"Attempt \(attempt): expected focus indicator and first responder to converge after Ctrl+D. data=\(done)"
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
func testCtrlDFromRealKeyboardAfterClosingRightColumnIn2x2KeepsWorkspaceOpen() {
|
|
let attempts = 8
|
|
for attempt in 1...attempts {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-keyboard-2x2-realkey-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_LAYOUT"] = "lrtd_close_right_then_exit_top_left"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_EXPECTED_PANELS_AFTER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_AUTO_TRIGGER"] = "0"
|
|
app.launch()
|
|
app.activate()
|
|
defer { app.terminate() }
|
|
|
|
XCTAssertTrue(
|
|
waitForAnyJSON(atPath: dataPath, timeout: 12.0),
|
|
"Attempt \(attempt): expected keyboard child-exit setup data at \(dataPath)"
|
|
)
|
|
guard let ready = waitForJSONKey("ready", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for ready=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = ready["setupError"], !setupError.isEmpty {
|
|
XCTFail("Attempt \(attempt): setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let panelCountBefore = Int(ready["panelCountBeforeCtrlD"] ?? "") ?? -1
|
|
let exitPanelId = ready["exitPanelId"] ?? ""
|
|
XCTAssertEqual(
|
|
panelCountBefore,
|
|
2,
|
|
"Attempt \(attempt): expected two panels before Ctrl+D in 2x2-right-close repro. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["focusedPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected target exit pane to be focused before Ctrl+D. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["firstResponderPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected first responder to match target pane before Ctrl+D. data=\(ready)"
|
|
)
|
|
|
|
app.typeKey("d", modifierFlags: [.control])
|
|
|
|
guard let done = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 10.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for done=1 after real keyboard Ctrl+D. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(done["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(done["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (done["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (done["timedOut"] ?? "") == "1"
|
|
let focusedPanelAfter = done["focusedPanelAfter"] ?? ""
|
|
let firstResponderPanelAfter = done["firstResponderPanelAfter"] ?? ""
|
|
|
|
XCTAssertFalse(timedOut, "Attempt \(attempt): real keyboard Ctrl+D timed out. data=\(done)")
|
|
XCTAssertFalse(closedWorkspace, "Attempt \(attempt): real keyboard Ctrl+D should not close workspace/window when another pane remains. data=\(done)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Attempt \(attempt): workspace should remain open after real keyboard Ctrl+D. data=\(done)")
|
|
XCTAssertEqual(panelCountAfter, 1, "Attempt \(attempt): only focused pane should close after real keyboard Ctrl+D. data=\(done)")
|
|
XCTAssertTrue(
|
|
waitForWindowCount(app: app, atLeast: 1, timeout: 2.0),
|
|
"Attempt \(attempt): app window should remain open after Ctrl+D closes one split. data=\(done)"
|
|
)
|
|
if let showChildExitedCount = Int(done["probeShowChildExitedCount"] ?? "") {
|
|
XCTAssertEqual(showChildExitedCount, 1, "Attempt \(attempt): expected exactly one SHOW_CHILD_EXITED callback for one Ctrl+D. data=\(done)")
|
|
}
|
|
if let keyDownCount = Int(done["probeKeyDownCount"] ?? "") {
|
|
XCTAssertEqual(keyDownCount, 1, "Attempt \(attempt): expected exactly one keyDown for one Ctrl+D keypress. data=\(done)")
|
|
}
|
|
if !focusedPanelAfter.isEmpty || !firstResponderPanelAfter.isEmpty {
|
|
XCTAssertEqual(
|
|
firstResponderPanelAfter,
|
|
focusedPanelAfter,
|
|
"Attempt \(attempt): expected focus indicator and first responder to converge after real keyboard Ctrl+D. data=\(done)"
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
func testCtrlDFromRealKeyboardInHorizontalSplitKeepsWindowOpen() {
|
|
let attempts = 12
|
|
for attempt in 1...attempts {
|
|
let app = XCUIApplication()
|
|
let dataPath = "/tmp/cmux-ui-test-child-exit-keyboard-lr-realkey-\(UUID().uuidString).json"
|
|
try? FileManager.default.removeItem(atPath: dataPath)
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_SETUP"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_PATH"] = dataPath
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_LAYOUT"] = "lr"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_EXPECTED_PANELS_AFTER"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_CHILD_EXIT_KEYBOARD_AUTO_TRIGGER"] = "0"
|
|
app.launch()
|
|
app.activate()
|
|
defer { app.terminate() }
|
|
|
|
XCTAssertTrue(
|
|
waitForAnyJSON(atPath: dataPath, timeout: 12.0),
|
|
"Attempt \(attempt): expected keyboard child-exit setup data at \(dataPath)"
|
|
)
|
|
guard let ready = waitForJSONKey("ready", equals: "1", atPath: dataPath, timeout: 12.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for ready=1. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
if let setupError = ready["setupError"], !setupError.isEmpty {
|
|
XCTFail("Attempt \(attempt): setup failed: \(setupError)")
|
|
return
|
|
}
|
|
|
|
let panelCountBefore = Int(ready["panelCountBeforeCtrlD"] ?? "") ?? -1
|
|
let exitPanelId = ready["exitPanelId"] ?? ""
|
|
XCTAssertEqual(
|
|
panelCountBefore,
|
|
2,
|
|
"Attempt \(attempt): expected two panels before Ctrl+D in left/right repro. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["focusedPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected target exit pane to be focused before Ctrl+D. data=\(ready)"
|
|
)
|
|
XCTAssertEqual(
|
|
ready["firstResponderPanelBefore"],
|
|
exitPanelId,
|
|
"Attempt \(attempt): expected first responder to match target pane before Ctrl+D. data=\(ready)"
|
|
)
|
|
|
|
app.typeKey("d", modifierFlags: [.control])
|
|
|
|
guard let done = waitForJSONKey("done", equals: "1", atPath: dataPath, timeout: 10.0) else {
|
|
XCTFail("Attempt \(attempt): timed out waiting for done=1 after real keyboard Ctrl+D. data=\(loadJSON(atPath: dataPath) ?? [:])")
|
|
return
|
|
}
|
|
|
|
let workspaceCountAfter = Int(done["workspaceCountAfter"] ?? "") ?? -1
|
|
let panelCountAfter = Int(done["panelCountAfter"] ?? "") ?? -1
|
|
let closedWorkspace = (done["closedWorkspace"] ?? "") == "1"
|
|
let timedOut = (done["timedOut"] ?? "") == "1"
|
|
let focusedPanelAfter = done["focusedPanelAfter"] ?? ""
|
|
let firstResponderPanelAfter = done["firstResponderPanelAfter"] ?? ""
|
|
|
|
XCTAssertFalse(timedOut, "Attempt \(attempt): real keyboard Ctrl+D timed out. data=\(done)")
|
|
XCTAssertFalse(closedWorkspace, "Attempt \(attempt): real keyboard Ctrl+D should not close workspace/window when another pane remains. data=\(done)")
|
|
XCTAssertEqual(workspaceCountAfter, 1, "Attempt \(attempt): workspace should remain open after real keyboard Ctrl+D. data=\(done)")
|
|
XCTAssertEqual(panelCountAfter, 1, "Attempt \(attempt): only focused pane should close after real keyboard Ctrl+D. data=\(done)")
|
|
XCTAssertTrue(
|
|
waitForWindowCount(app: app, atLeast: 1, timeout: 2.0),
|
|
"Attempt \(attempt): app window should remain open after Ctrl+D closes one split. data=\(done)"
|
|
)
|
|
if let showChildExitedCount = Int(done["probeShowChildExitedCount"] ?? "") {
|
|
XCTAssertEqual(showChildExitedCount, 1, "Attempt \(attempt): expected exactly one SHOW_CHILD_EXITED callback for one Ctrl+D. data=\(done)")
|
|
}
|
|
if let keyDownCount = Int(done["probeKeyDownCount"] ?? "") {
|
|
XCTAssertEqual(keyDownCount, 1, "Attempt \(attempt): expected exactly one keyDown for one Ctrl+D keypress. data=\(done)")
|
|
}
|
|
if !focusedPanelAfter.isEmpty || !firstResponderPanelAfter.isEmpty {
|
|
XCTAssertEqual(
|
|
firstResponderPanelAfter,
|
|
focusedPanelAfter,
|
|
"Attempt \(attempt): expected focus indicator and first responder to converge after real keyboard Ctrl+D. data=\(done)"
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func waitForCloseWorkspaceAlert(app: XCUIApplication, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if app.dialogs.containing(.staticText, identifier: "Close workspace?").firstMatch.exists { return true }
|
|
if app.alerts.containing(.staticText, identifier: "Close workspace?").firstMatch.exists { return true }
|
|
if app.staticTexts["Close workspace?"].exists { return true }
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
return false
|
|
}
|
|
|
|
private func waitForCloseTabAlert(app: XCUIApplication, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if app.dialogs.containing(.staticText, identifier: "Close tab?").firstMatch.exists { return true }
|
|
if app.alerts.containing(.staticText, identifier: "Close tab?").firstMatch.exists { return true }
|
|
if app.staticTexts["Close tab?"].exists { return true }
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
return false
|
|
}
|
|
|
|
private func waitForWindowCount(app: XCUIApplication, toBe count: Int, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if app.windows.count == count { return true }
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
return app.windows.count == count
|
|
}
|
|
|
|
private func waitForWindowCount(app: XCUIApplication, atLeast count: Int, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if app.windows.count >= count { return true }
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
return app.windows.count >= count
|
|
}
|
|
|
|
private func waitForNoWindowsOrAppNotRunningForeground(app: XCUIApplication, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if app.state != .runningForeground { return true }
|
|
if app.windows.count == 0 { return true }
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
return app.state != .runningForeground || app.windows.count == 0
|
|
}
|
|
|
|
private func waitForAnyJSON(atPath path: String, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if loadJSON(atPath: path) != nil { return true }
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
return loadJSON(atPath: path) != nil
|
|
}
|
|
|
|
private func waitForJSONKey(_ key: String, equals expected: String, atPath path: String, timeout: TimeInterval) -> [String: String]? {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if let data = loadJSON(atPath: path), data[key] == expected {
|
|
return data
|
|
}
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
if let data = loadJSON(atPath: path), data[key] == expected {
|
|
return data
|
|
}
|
|
return nil
|
|
}
|
|
|
|
private func loadJSON(atPath path: String) -> [String: String]? {
|
|
guard let data = try? Data(contentsOf: URL(fileURLWithPath: path)),
|
|
let object = try? JSONSerialization.jsonObject(with: data) as? [String: String] else {
|
|
return nil
|
|
}
|
|
return object
|
|
}
|
|
|
|
}
|