marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Return on Cmd+Ctrl+W close confirmation (#1279)

Browse source 
* Add close-window return-key regression test

* Focus close-window confirmation button

* Keep Return on close-window alert

* Address review feedback
This commit is contained in:
Lawrence Chen 2026-03-12 05:25:14 -07:00 • committed by GitHub
parent df065790d5
commit 054b91f641
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 56 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Sources/AppDelegate.swift
View file

@ -4446,10 +4446,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
alert.addButton(withTitle: String(localized: "common.close", defaultValue: "Close"))
alert.addButton(withTitle: String(localized: "common.cancel", defaultValue: "Cancel"))
let alertWindow = alert.window
if let closeButton = alert.buttons.first {
closeButton.keyEquivalent = "d"
closeButton.keyEquivalentModifierMask = [.command]
alert.window.defaultButtonCell = closeButton.cell as? NSButtonCell
alertWindow.defaultButtonCell = closeButton.cell as? NSButtonCell
alertWindow.initialFirstResponder = closeButton
DispatchQueue.main.async {
_ = alertWindow.makeFirstResponder(closeButton)
}
}
return alert.runModal() == .alertFirstButtonReturn

50
cmuxUITests/CloseWindowConfirmDialogUITests.swift
View file

@ -33,6 +33,34 @@ final class CloseWindowConfirmDialogUITests: XCTestCase {
XCTAssertTrue(app.windows.firstMatch.exists, "Expected the window to remain open after cancelling close")
}
func testReturnConfirmsCloseWindowDialog() {
let app = XCUIApplication()
app.launchEnvironment["CMUX_TAG"] = launchTag
app.launch()
XCTAssertTrue(
ensureForegroundAfterLaunch(app, timeout: 12.0),
"Expected app to launch for close-window confirmation test. state=\(app.state.rawValue)"
)
app.typeKey("w", modifierFlags: [.command, .control])
XCTAssertTrue(
waitForCloseWindowAlert(app: app, timeout: 5.0),
"Expected Cmd+Ctrl+W to show the close window confirmation alert"
)
app.typeKey(.return, modifierFlags: [])
XCTAssertTrue(
waitForCloseWindowAlertToDismiss(app: app, timeout: 5.0),
"Expected Return to dismiss the close window confirmation alert"
)
XCTAssertTrue(
waitForMainWindowToClose(app: app, timeout: 5.0),
"Expected Return to confirm window close"
)
}
private func isCloseWindowAlertPresent(app: XCUIApplication) -> Bool {
if closeWindowDialog(app: app).exists { return true }
if closeWindowAlert(app: app).exists { return true }
@ -50,6 +78,28 @@ final class CloseWindowConfirmDialogUITests: XCTestCase {
return isCloseWindowAlertPresent(app: app)
}
private func waitForCloseWindowAlertToDismiss(app: XCUIApplication, timeout: TimeInterval) -> Bool {
let deadline = Date().addingTimeInterval(timeout)
while Date() < deadline {
if !isCloseWindowAlertPresent(app: app) {
return true
}
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
}
return !isCloseWindowAlertPresent(app: app)
}
private func waitForMainWindowToClose(app: XCUIApplication, timeout: TimeInterval) -> Bool {
let deadline = Date().addingTimeInterval(timeout)
while Date() < deadline {
if !app.windows.firstMatch.exists {
return true
}
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
}
return !app.windows.firstMatch.exists
}
private func clickCancelOnCloseWindowAlert(app: XCUIApplication) {
let dialog = closeWindowDialog(app: app)
if dialog.exists {