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

Revert UI test foreground activation changes back to 56a4d258

Browse source 
Reverts cbb21872, 54ec524a, 10fd323b, 75375ab7, 82a16aa7 — all
attempts to fix display resolution UI test foreground activation
on CI that introduced regressions. Restores the state from the
last fully green CI run (56a4d258).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
austinpower1258 2026-03-23 02:38:06 -07:00
parent 82a16aa746
commit fc858fcfa4
3 changed files with 35 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Sources/AppDelegate.swift
View file

@ -1929,10 +1929,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
Self.cachedIsRunningUnderXCTest
}
#if DEBUG
private var uiTestForegroundActivationInFlight = false
#endif
private static func detectRunningUnderXCTest(_ env: [String: String]) -> Bool {
if env["XCTestConfigurationFilePath"] != nil { return true }
if env["XCTestBundlePath"] != nil { return true }
@ -2369,7 +2365,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
// In UI tests, `WindowGroup` occasionally fails to materialize a window quickly on the VM.
// If there are no windows shortly after launch, force-create one so XCUITest can proceed.
if isRunningUnderXCTest {
scheduleUITestForegroundActivationIfNeeded(reason: "didFinishLaunching")
if let rawVariant = env["CMUX_UI_TEST_BROWSER_IMPORT_HINT_VARIANT"] {
UserDefaults.standard.set(
BrowserImportHintSettings.variant(for: rawVariant).rawValue,
@ -2394,7 +2389,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
self.openNewMainWindow(nil)
}
self.moveUITestWindowToTargetDisplayIfNeeded()
self.scheduleUITestForegroundActivationIfNeeded(reason: "afterForceWindow")
NSRunningApplication.current.activate(options: [.activateAllWindows, .activateIgnoringOtherApps])
self.writeUITestDiagnosticsIfNeeded(stage: "afterForceWindow")
}
if env["CMUX_UI_TEST_BROWSER_IMPORT_HINT_OPEN_BLANK_BROWSER"] == "1" {
@ -2420,12 +2415,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
#endif
}
func applicationWillFinishLaunching(_ notification: Notification) {
#if DEBUG
scheduleUITestForegroundActivationIfNeeded(reason: "willFinishLaunching")
#endif
}
#if DEBUG
private func writeUITestDiagnosticsIfNeeded(stage: String) {
let env = ProcessInfo.processInfo.environment
@ -2444,8 +2433,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
payload["pid"] = String(ProcessInfo.processInfo.processIdentifier)
payload["bundleId"] = Bundle.main.bundleIdentifier ?? ""
payload["isRunningUnderXCTest"] = isRunningUnderXCTest ? "1" : "0"
payload["appIsActive"] = NSApp.isActive ? "1" : "0"
payload["activationPolicy"] = debugActivationPolicyDescription(NSApp.activationPolicy())
payload["windowsCount"] = String(windows.count)
payload["windowIdentifiers"] = ids
payload["windowVisibleFlags"] = vis
@ -2577,66 +2564,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
)
}
private func scheduleUITestForegroundActivationIfNeeded(reason: String) {
let env = ProcessInfo.processInfo.environment
guard isRunningUnderXCTest(env) else { return }
guard !uiTestForegroundActivationInFlight else { return }
uiTestForegroundActivationInFlight = true
attemptUITestForegroundActivation(reason: reason, attempt: 0)
}
private func attemptUITestForegroundActivation(reason: String, attempt: Int) {
let env = ProcessInfo.processInfo.environment
guard isRunningUnderXCTest(env) else {
uiTestForegroundActivationInFlight = false
return
}
if NSApp.activationPolicy() != .regular {
_ = NSApp.setActivationPolicy(.regular)
}
if NSApp.isHidden {
NSApp.unhide(nil)
}
let windows = NSApp.windows
if let window = windows.first {
window.orderFrontRegardless()
window.makeKeyAndOrderFront(nil)
}
NSApp.activate(ignoringOtherApps: true)
NSRunningApplication.current.activate(options: [.activateAllWindows, .activateIgnoringOtherApps])
writeUITestDiagnosticsIfNeeded(stage: "foreground.\(reason).\(attempt)")
if NSApp.isActive {
uiTestForegroundActivationInFlight = false
return
}
guard attempt < 20 else {
uiTestForegroundActivationInFlight = false
return
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { [weak self] in
self?.attemptUITestForegroundActivation(reason: reason, attempt: attempt + 1)
}
}
private func debugActivationPolicyDescription(_ policy: NSApplication.ActivationPolicy) -> String {
switch policy {
case .regular:
return "regular"
case .accessory:
return "accessory"
case .prohibited:
return "prohibited"
@unknown default:
return "unknown(\(policy.rawValue))"
}
}
private func moveUITestWindowToTargetDisplayIfNeeded(attempt: Int = 0) {
let env = ProcessInfo.processInfo.environment
guard let rawDisplayID = env["CMUX_UI_TEST_TARGET_DISPLAY_ID"],
@ -2677,7 +2604,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
window.setFrame(frame, display: true, animate: false)
window.makeKeyAndOrderFront(nil)
window.orderFrontRegardless()
scheduleUITestForegroundActivationIfNeeded(reason: "afterMoveToTargetDisplay")
if window.screen?.cmuxDisplayID != targetDisplayID, attempt < 20 {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { [weak self] in
self?.moveUITestWindowToTargetDisplayIfNeeded(attempt: attempt + 1)