* 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
355 lines
15 KiB
Swift
355 lines
15 KiB
Swift
import XCTest
|
|
import Foundation
|
|
|
|
final class UpdatePillUITests: XCTestCase {
|
|
override func setUp() {
|
|
super.setUp()
|
|
continueAfterFailure = false
|
|
}
|
|
|
|
func testUpdatePillShowsForAvailableUpdate() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
let app = XCUIApplication()
|
|
app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_UPDATE_STATE"] = "available"
|
|
app.launchEnvironment["CMUX_UI_TEST_UPDATE_VERSION"] = "9.9.9"
|
|
launchAndActivate(app)
|
|
|
|
let pill = pillButton(app: app, expectedLabel: "Update Available: 9.9.9")
|
|
XCTAssertTrue(pill.waitForExistence(timeout: 6.0))
|
|
XCTAssertEqual(pill.label, "Update Available: 9.9.9")
|
|
assertVisibleSize(pill)
|
|
attachScreenshot(name: "update-available")
|
|
// Element screenshots are flaky on the UTM VM (image creation fails intermittently).
|
|
// Keep a stable attachment with element state instead.
|
|
attachElementDebug(name: "update-available-pill", element: pill)
|
|
}
|
|
|
|
func testUpdatePillShowsForNoUpdateThenDismisses() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
let timingPath = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("cmux-ui-test-timing-\(UUID().uuidString).json")
|
|
let app = XCUIApplication()
|
|
app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_UPDATE_STATE"] = "notFound"
|
|
app.launchEnvironment["CMUX_UI_TEST_TIMING_PATH"] = timingPath.path
|
|
launchAndActivate(app)
|
|
|
|
let pill = pillButton(app: app, expectedLabel: "No Updates Available")
|
|
XCTAssertTrue(pill.waitForExistence(timeout: 6.0))
|
|
XCTAssertEqual(pill.label, "No Updates Available")
|
|
assertVisibleSize(pill)
|
|
attachScreenshot(name: "no-updates")
|
|
attachElementDebug(name: "no-updates-pill", element: pill)
|
|
|
|
let gone = XCTNSPredicateExpectation(
|
|
predicate: NSPredicate(format: "exists == false"),
|
|
object: pill
|
|
)
|
|
XCTAssertEqual(XCTWaiter().wait(for: [gone], timeout: 7.0), .completed)
|
|
|
|
let payload = loadTimingPayload(from: timingPath)
|
|
let shownAt = payload["noUpdateShownAt"] ?? 0
|
|
let hiddenAt = payload["noUpdateHiddenAt"] ?? 0
|
|
XCTAssertGreaterThan(shownAt, 0)
|
|
XCTAssertGreaterThan(hiddenAt, shownAt)
|
|
XCTAssertGreaterThanOrEqual(hiddenAt - shownAt, 4.8)
|
|
}
|
|
|
|
func testCheckForUpdatesUsesMockFeedWithUpdate() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
let app = launchAppWithMockFeed(mode: "available", version: "9.9.9")
|
|
|
|
let pill = pillButton(app: app, expectedLabel: "Update Available: 9.9.9")
|
|
XCTAssertTrue(pill.waitForExistence(timeout: 6.0))
|
|
XCTAssertEqual(pill.label, "Update Available: 9.9.9")
|
|
assertVisibleSize(pill)
|
|
attachScreenshot(name: "mock-update-available")
|
|
}
|
|
|
|
func testCheckForUpdatesUsesMockFeedWithNoUpdate() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
let timingPath = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("cmux-ui-test-timing-\(UUID().uuidString).json")
|
|
let app = launchAppWithMockFeed(mode: "none", version: "9.9.9", timingPath: timingPath)
|
|
|
|
let pill = pillButton(app: app, expectedLabel: "No Updates Available")
|
|
XCTAssertTrue(pill.waitForExistence(timeout: 6.0))
|
|
XCTAssertEqual(pill.label, "No Updates Available")
|
|
assertVisibleSize(pill)
|
|
attachScreenshot(name: "mock-no-updates")
|
|
}
|
|
|
|
func testCheckForUpdatesShowsLoadingThenNoUpdateInSidebarFooter() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
let app = launchAppWithMockFeed(
|
|
mode: "none",
|
|
version: "9.9.9",
|
|
extraEnvironment: [
|
|
"CMUX_UI_TEST_MOCK_FEED_DELAY_MS": "7000",
|
|
]
|
|
)
|
|
|
|
XCTAssertTrue(waitForWindowCount(atLeast: 1, app: app, timeout: 6.0))
|
|
|
|
let checkingPill = pillButton(app: app, expectedLabel: "Checking for Updates…")
|
|
XCTAssertTrue(checkingPill.waitForExistence(timeout: 6.0))
|
|
assertVisibleSize(checkingPill)
|
|
|
|
let noUpdatePill = pillButton(app: app, expectedLabel: "No Updates Available")
|
|
XCTAssertTrue(noUpdatePill.waitForExistence(timeout: 8.0))
|
|
assertVisibleSize(noUpdatePill)
|
|
}
|
|
|
|
func testNoSparklePermissionDialogIsShown() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
|
|
let app = XCUIApplication()
|
|
// Make Sparkle re-request permission on startup, but we should auto-handle it with no UI.
|
|
app.launchEnvironment["CMUX_UI_TEST_RESET_SPARKLE_PERMISSION"] = "1"
|
|
launchAndActivate(app)
|
|
|
|
XCTAssertTrue(waitForWindowCount(atLeast: 1, app: app, timeout: 6.0))
|
|
|
|
// Sparkle's default permission prompt is an NSAlert with these labels.
|
|
XCTAssertFalse(app.staticTexts["Check for updates automatically?"].waitForExistence(timeout: 2.0))
|
|
XCTAssertFalse(app.buttons["Don't Check"].exists)
|
|
XCTAssertFalse(app.buttons["Check Automatically"].exists)
|
|
}
|
|
|
|
func testCheckForUpdatesStatesRemainVisibleWhenSidebarHidden() {
|
|
let systemSettings = XCUIApplication(bundleIdentifier: "com.apple.systempreferences")
|
|
systemSettings.terminate()
|
|
let app = launchAppWithMockFeed(
|
|
mode: "none",
|
|
version: "9.9.9",
|
|
extraEnvironment: [
|
|
"CMUX_UI_TEST_MOCK_FEED_DELAY_MS": "7000",
|
|
]
|
|
)
|
|
|
|
XCTAssertTrue(waitForWindowCount(atLeast: 1, app: app, timeout: 6.0))
|
|
app.typeKey("b", modifierFlags: [.command]) // hide sidebar
|
|
|
|
let checkingPill = pillButton(app: app, expectedLabel: "Checking for Updates…")
|
|
XCTAssertTrue(checkingPill.waitForExistence(timeout: 6.0))
|
|
assertVisibleSize(checkingPill)
|
|
|
|
let noUpdatePill = pillButton(app: app, expectedLabel: "No Updates Available")
|
|
XCTAssertTrue(noUpdatePill.waitForExistence(timeout: 8.0))
|
|
assertVisibleSize(noUpdatePill)
|
|
}
|
|
|
|
private func pillButton(app: XCUIApplication, expectedLabel: String) -> XCUIElement {
|
|
// On macOS, SwiftUI accessibility identifiers are not always reliably surfaced for titlebar-style
|
|
// UI across OS/Xcode versions. Prefer the pill's accessibility label, but keep an identifier
|
|
// fallback for local runs.
|
|
return app.buttons[expectedLabel]
|
|
}
|
|
|
|
private func waitForWindowCount(atLeast count: Int, app: XCUIApplication, 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 assertVisibleSize(_ element: XCUIElement, timeout: TimeInterval = 2.0) {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
var size = element.frame.size
|
|
while Date() < deadline {
|
|
size = element.frame.size
|
|
if size.width > 20 && size.height > 10 {
|
|
return
|
|
}
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
XCTFail("Expected UpdatePill to have visible size, got \(size)")
|
|
}
|
|
|
|
private func attachScreenshot(name: String, screenshot: XCUIScreenshot = XCUIScreen.main.screenshot()) {
|
|
let attachment = XCTAttachment(screenshot: screenshot)
|
|
attachment.name = name
|
|
attachment.lifetime = .keepAlways
|
|
add(attachment)
|
|
}
|
|
|
|
private func attachElementDebug(name: String, element: XCUIElement) {
|
|
let payload = """
|
|
label: \(element.label)
|
|
exists: \(element.exists)
|
|
hittable: \(element.isHittable)
|
|
frame: \(element.frame)
|
|
"""
|
|
let attachment = XCTAttachment(string: payload)
|
|
attachment.name = name
|
|
attachment.lifetime = .keepAlways
|
|
add(attachment)
|
|
}
|
|
|
|
private func launchAppWithMockFeed(
|
|
mode: String,
|
|
version: String,
|
|
timingPath: URL? = nil,
|
|
extraEnvironment: [String: String] = [:]
|
|
) -> XCUIApplication {
|
|
let app = XCUIApplication()
|
|
app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_FEED_URL"] = "https://cmux.test/appcast.xml"
|
|
app.launchEnvironment["CMUX_UI_TEST_FEED_MODE"] = mode
|
|
app.launchEnvironment["CMUX_UI_TEST_UPDATE_VERSION"] = version
|
|
app.launchEnvironment["CMUX_UI_TEST_AUTO_ALLOW_PERMISSION"] = "1"
|
|
app.launchEnvironment["CMUX_UI_TEST_TRIGGER_UPDATE_CHECK"] = "1"
|
|
if let timingPath {
|
|
app.launchEnvironment["CMUX_UI_TEST_TIMING_PATH"] = timingPath.path
|
|
}
|
|
for (key, value) in extraEnvironment {
|
|
app.launchEnvironment[key] = value
|
|
}
|
|
launchAndActivate(app)
|
|
return app
|
|
}
|
|
|
|
private func launchAndActivate(_ app: XCUIApplication, activateTimeout: TimeInterval = 2.0) {
|
|
app.launch()
|
|
let deadline = Date().addingTimeInterval(activateTimeout)
|
|
while Date() < deadline, app.state != .runningForeground {
|
|
app.activate()
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
if app.state != .runningForeground {
|
|
app.activate()
|
|
}
|
|
}
|
|
|
|
private func loadTimingPayload(from url: URL) -> [String: Double] {
|
|
guard let data = try? Data(contentsOf: url),
|
|
let object = try? JSONSerialization.jsonObject(with: data) as? [String: Double] else {
|
|
return [:]
|
|
}
|
|
return object
|
|
}
|
|
}
|
|
|
|
final class TitlebarShortcutHintsUITests: XCTestCase {
|
|
override func setUp() {
|
|
super.setUp()
|
|
continueAfterFailure = false
|
|
}
|
|
|
|
func testTitlebarShortcutHintsAlignWithoutShiftingControls() {
|
|
let baselineApp = launchApp(alwaysShowHints: false)
|
|
XCTAssertTrue(waitForWindowCount(atLeast: 1, app: baselineApp, timeout: 8.0))
|
|
|
|
let baselineToggle = baselineApp.buttons["titlebarControl.toggleSidebar"]
|
|
let baselineNotifications = baselineApp.buttons["titlebarControl.showNotifications"]
|
|
let baselineNewTab = baselineApp.buttons["titlebarControl.newTab"]
|
|
|
|
XCTAssertTrue(waitForElementVisible(baselineToggle, timeout: 6.0))
|
|
XCTAssertTrue(waitForElementVisible(baselineNotifications, timeout: 6.0))
|
|
XCTAssertTrue(waitForElementVisible(baselineNewTab, timeout: 6.0))
|
|
|
|
let baselineToggleFrame = baselineToggle.frame
|
|
let baselineNotificationsFrame = baselineNotifications.frame
|
|
let baselineNewTabFrame = baselineNewTab.frame
|
|
|
|
baselineApp.terminate()
|
|
|
|
let hintedApp = launchApp(alwaysShowHints: true)
|
|
XCTAssertTrue(waitForWindowCount(atLeast: 1, app: hintedApp, timeout: 8.0))
|
|
|
|
let hintedToggle = hintedApp.buttons["titlebarControl.toggleSidebar"]
|
|
let hintedNotifications = hintedApp.buttons["titlebarControl.showNotifications"]
|
|
let hintedNewTab = hintedApp.buttons["titlebarControl.newTab"]
|
|
|
|
XCTAssertTrue(waitForElementVisible(hintedToggle, timeout: 6.0))
|
|
XCTAssertTrue(waitForElementVisible(hintedNotifications, timeout: 6.0))
|
|
XCTAssertTrue(waitForElementVisible(hintedNewTab, timeout: 6.0))
|
|
|
|
let sidebarHint = hintedApp.staticTexts["titlebarShortcutHint.toggleSidebar"]
|
|
let notificationsHint = hintedApp.staticTexts["titlebarShortcutHint.showNotifications"]
|
|
let newTabHint = hintedApp.staticTexts["titlebarShortcutHint.newTab"]
|
|
|
|
XCTAssertTrue(waitForElementVisible(sidebarHint, timeout: 6.0))
|
|
XCTAssertTrue(waitForElementVisible(notificationsHint, timeout: 6.0))
|
|
XCTAssertTrue(waitForElementVisible(newTabHint, timeout: 6.0))
|
|
|
|
let hintedToggleFrame = hintedToggle.frame
|
|
let hintedNotificationsFrame = hintedNotifications.frame
|
|
let hintedNewTabFrame = hintedNewTab.frame
|
|
|
|
XCTAssertEqual(hintedToggleFrame.minY, baselineToggleFrame.minY, accuracy: 1.0)
|
|
XCTAssertEqual(hintedNotificationsFrame.minY, baselineNotificationsFrame.minY, accuracy: 1.0)
|
|
XCTAssertEqual(hintedNewTabFrame.minY, baselineNewTabFrame.minY, accuracy: 1.0)
|
|
|
|
let sidebarHintFrame = sidebarHint.frame
|
|
let notificationsHintFrame = notificationsHint.frame
|
|
let newTabHintFrame = newTabHint.frame
|
|
|
|
XCTAssertEqual(sidebarHintFrame.minY, notificationsHintFrame.minY, accuracy: 1.0)
|
|
XCTAssertEqual(notificationsHintFrame.minY, newTabHintFrame.minY, accuracy: 1.0)
|
|
// Keep the sidebar hint lane to the right of the sidebar icon so it cannot clip into the traffic-light backdrop.
|
|
XCTAssertGreaterThanOrEqual(sidebarHintFrame.minX, hintedToggleFrame.minX - 1.0)
|
|
|
|
let sortedHintFrames = [sidebarHintFrame, notificationsHintFrame, newTabHintFrame]
|
|
.sorted { $0.minX < $1.minX }
|
|
for index in 1..<sortedHintFrames.count {
|
|
let previousFrame = sortedHintFrames[index - 1]
|
|
let currentFrame = sortedHintFrames[index]
|
|
XCTAssertGreaterThanOrEqual(currentFrame.minX - previousFrame.maxX, 2.0)
|
|
}
|
|
}
|
|
|
|
private func launchApp(alwaysShowHints: Bool) -> XCUIApplication {
|
|
let app = XCUIApplication()
|
|
app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
|
|
app.launchArguments += ["-shortcutHintAlwaysShow", alwaysShowHints ? "YES" : "NO"]
|
|
app.launchArguments += ["-shortcutHintTitlebarXOffset", "4"]
|
|
app.launchArguments += ["-shortcutHintTitlebarYOffset", "0"]
|
|
app.launch()
|
|
|
|
let deadline = Date().addingTimeInterval(2.0)
|
|
while Date() < deadline, app.state != .runningForeground {
|
|
app.activate()
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
|
|
return app
|
|
}
|
|
|
|
private func waitForWindowCount(atLeast count: Int, app: XCUIApplication, 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 waitForElementVisible(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
|
|
let deadline = Date().addingTimeInterval(timeout)
|
|
while Date() < deadline {
|
|
if element.exists {
|
|
let frame = element.frame
|
|
if frame.width > 1, frame.height > 1 {
|
|
return true
|
|
}
|
|
}
|
|
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
|
|
}
|
|
|
|
if element.exists {
|
|
let frame = element.frame
|
|
return frame.width > 1 && frame.height > 1
|
|
}
|
|
return false
|
|
}
|
|
}
|