Skip to content

Commit 876f091

Browse files
authored
feat: close macOS parity gaps (#311)
* feat: close macos parity gaps * fix: support targeted macOS menubar app snapshots * chore: clarify menubar fallback heuristics * chore: address review nits * fix: complete macOS parity flow
1 parent 8888dd5 commit 876f091

59 files changed

Lines changed: 1341 additions & 240 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ios-runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+CommandExecution.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,22 @@ extension RunnerTests {
533533
if let bundleId = command.appBundleId, !bundleId.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
534534
let targetApp = XCUIApplication(bundleIdentifier: bundleId)
535535
targetApp.activate()
536+
activeApp = targetApp
536537
// Brief wait for the app transition animation to complete
537538
Thread.sleep(forTimeInterval: 0.5)
538539
}
539-
let screenshot = XCUIScreen.main.screenshot()
540+
let screenshot: XCUIScreenshot
541+
#if os(macOS)
542+
if command.fullscreen == true {
543+
screenshot = XCUIScreen.main.screenshot()
544+
} else if let bundleId = command.appBundleId, !bundleId.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
545+
screenshot = screenshotRoot(app: activeApp).screenshot()
546+
} else {
547+
screenshot = XCUIScreen.main.screenshot()
548+
}
549+
#else
550+
screenshot = XCUIScreen.main.screenshot()
551+
#endif
540552
guard let pngData = runnerPngData(for: screenshot.image) else {
541553
return Response(ok: false, error: ErrorPayload(message: "Failed to encode screenshot as PNG"))
542554
}

‎ios-runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Lifecycle.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ extension RunnerTests {
3838
return image
3939
}
4040

41+
func screenshotRoot(app: XCUIApplication) -> XCUIElement {
42+
#if os(macOS)
43+
let windows = app.windows.allElementsBoundByIndex
44+
if let window = windows.first(where: { $0.exists && !$0.frame.isNull && !$0.frame.isEmpty }) {
45+
return window
46+
}
47+
#endif
48+
return app
49+
}
50+
4151
func stopRecordingIfNeeded() {
4252
guard let recorder = activeRecording else { return }
4353
do {

‎ios-runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Models.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ struct Command: Codable {
5555
let depth: Int?
5656
let scope: String?
5757
let raw: Bool?
58+
let fullscreen: Bool?
5859
}
5960

6061
struct Response: Codable {

0 commit comments

Comments
 (0)