agent-device 0.21.12 → 0.21.14

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Alert.swift

@@ -83,8 +83,10 @@ extension RunnerTests {
 
 
       var outcome = RunnerInteractionOutcome.performed
-      withBoundedInteractionIdleTimeoutIfSupported(alert.ownerApp, waits: .preEventSkipped) {
-        outcome = activateElement(app: alert.ownerApp, element: button, action: "alert \(action)")
+      withUIInterruptionHandlingDisabledIfSupported(alert.ownerApp) {
+        withBoundedInteractionIdleTimeoutIfSupported(alert.ownerApp, waits: .preEventSkipped) {
+          outcome = activateElement(app: alert.ownerApp, element: button, action: "alert \(action)")
+        }
       }
       if let response = unsupportedResponse(for: outcome) {
         return response
@@ -114,6 +116,22 @@ extension RunnerTests {
     )
   }
 
+
+
+
+
+  private func withUIInterruptionHandlingDisabledIfSupported(_ target: XCUIApplication, operation: () -> Void) {
+    let key = "doesNotHandleUIInterruptions"
+    guard target.responds(to: NSSelectorFromString("setDoesNotHandleUIInterruptions:")) else {
+      operation()
+      return
+    }
+    let previous = target.value(forKey: key) as? NSNumber
+    target.setValue(true, forKey: key)
+    defer { target.setValue(previous?.boolValue ?? false, forKey: key) }
+    operation()
+  }
+
   private func runnerAlert(_ modal: ResolvedBlockingSystemModal) -> RunnerAlert? {
     let buttons = modal.actions.filter { isEnabledElement($0) }
     guard !buttons.isEmpty else {
@@ -143,22 +161,26 @@ extension RunnerTests {
     elements.first { isVisibleElement($0) }
   }
 
+
+
+
+
   private func firstDismissPopupWindow(in app: XCUIApplication) -> XCUIElement? {
-    safeElementsQuery {
-      app.windows.allElementsBoundByIndex
-    }.first { window in
-      if !isVisibleElement(window) { return false }
-      if isDismissPopupMarker(window.label) || isDismissPopupMarker(window.identifier) {
-        return true
-      }
-      return safeElementsQuery {
-        window.descendants(matching: .any).allElementsBoundByIndex
-      }.contains { descendant in
-        isDismissPopupMarker(descendant.label) || isDismissPopupMarker(descendant.identifier)
-      }
-    }
+    firstExistingElement(in: safeElementsQuery {
+      app.windows.containing(Self.dismissPopupMarker).allElementsBoundByIndex
+    })
   }
 
+
+
+  private static let dismissPopupMarkerPattern = #"\s*dismiss popup\s*"#
+  private static let dismissPopupMarker = NSPredicate(
+    format: "label MATCHES[c] %@ OR identifier MATCHES[c] %@",
+    dismissPopupMarkerPattern,
+    dismissPopupMarkerPattern
+  )
+  private static let dismissPopupMarkerText = NSPredicate(format: "SELF MATCHES[c] %@", dismissPopupMarkerPattern)
+
   private func chooseAlertButton(_ buttons: [XCUIElement], action: String) -> XCUIElement? {
     if action == "accept" {
       if let accept = buttons.first(where: { isAcceptButton($0.label) }) {
@@ -170,7 +192,7 @@ extension RunnerTests {
     return buttons.first(where: { isDismissButton($0.label) }) ?? buttons.last
   }
 
-  private func isAcceptButton(_ label: String) -> Bool {
+  func isAcceptButton(_ label: String) -> Bool {
     let normalized = label.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
     return [
       "ok",
@@ -183,12 +205,6 @@ extension RunnerTests {
     ].contains(normalized) || normalized.hasPrefix("confirm")
   }
 
-
-
-
-
-
-
   private func isDismissButton(_ label: String) -> Bool {
     [
       "cancel",
@@ -273,7 +289,7 @@ extension RunnerTests {
     return hittable
   }
 
-  private func isDismissPopupMarker(_ label: String) -> Bool {
-    label.trimmingCharacters(in: .whitespacesAndNewlines).caseInsensitiveCompare("dismiss popup") == .orderedSame
+  func isDismissPopupMarker(_ text: String) -> Bool {
+    Self.dismissPopupMarkerText.evaluate(with: text)
   }
 }

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+AlertObservation.swift

@@ -68,9 +68,8 @@ extension RunnerTests {
   }
 
   private func containsDismissPopupMarker(_ snapshot: XCUIElementSnapshot) -> Bool {
-    [snapshot.label, snapshot.identifier].contains {
-      $0.trimmingCharacters(in: .whitespacesAndNewlines).caseInsensitiveCompare("dismiss popup") == .orderedSame
-    } || snapshot.children.contains { containsDismissPopupMarker($0) }
+    [snapshot.label, snapshot.identifier].contains { isDismissPopupMarker($0) } ||
+      snapshot.children.contains { containsDismissPopupMarker($0) }
   }
 
   private func alertPresentation(_ snapshot: XCUIElementSnapshot) -> RunnerAlertPresentation {

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+BlockingSystemModalResolution.swift

@@ -79,39 +79,3 @@ enum RemoteHostedSystemModalPolicy {
     state == .runningForeground
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-