fix: stabilize Settings replay selectors

Author: thymikee

ios-runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Snapshot.swift

@@ -273,7 +273,7 @@ extension RunnerTests {
       : Date.distantFuture
     var seen = Set<String>()
     var candidates: [SnapshotNode] = []
-    for element in flatFallbackElements(app: app, options: options) {
+    for element in flatFallbackElements(app: app, options: options, deadline: deadline) {
       if Date() >= deadline {
         NSLog("AGENT_DEVICE_RUNNER_SNAPSHOT_FLAT_FALLBACK_DEADLINE")
         break
@@ -822,7 +822,11 @@ extension RunnerTests {
     safely("SNAPSHOT_QUERY", [], fetch)
   }
 
-  private func flatFallbackElements(app: XCUIApplication, options: SnapshotOptions) -> [XCUIElement] {
+  private func flatFallbackElements(
+    app: XCUIApplication,
+    options: SnapshotOptions,
+    deadline: Date
+  ) -> [XCUIElement] {
     let queries: [XCUIElementQuery] = options.interactiveOnly ? [
       app.buttons,
       app.links,
@@ -866,7 +870,6 @@ extension RunnerTests {
       }
     }
 
-    let deadline = Date().addingTimeInterval(Self.flatInteractiveFallbackBudget)
     var elements: [XCUIElement] = []
     for query in queries {
       if Date() >= deadline {

test/integration/replays/ios/device/01-physical-lifecycle.ad

@@ -2,7 +2,7 @@
 context platform=ios target=mobile
 open com.apple.Preferences --relaunch
 snapshot
-click "role=button label=General"
+click "role=cell label=General || role=button label=General"
 wait "label=About || label=\"Software Update\"" 5000
 back
-is exists "role=button label=General"
+is exists "role=cell label=General || role=button label=General"

test/integration/replays/ios/simulator/01-settings.ad

@@ -4,7 +4,7 @@ open com.apple.Preferences --relaunch
 screenshot "./test/screenshots/replays/ios-settings.png"
 snapshot -i
 appstate
-click "role=button label=General"
+click "role=cell label=General || role=button label=General"
 wait "label=About || label=\"Software Update\" || text=\"Manage your overall setup and preferences\"" 5000
 snapshot
 is exists "label=About || label=\"Software Update\" || text=\"Manage your overall setup and preferences\""

test/integration/replays/ios/simulator/02-deep-navigation.ad

@@ -2,7 +2,7 @@
 context platform=ios target=mobile
 
 open com.apple.Preferences --relaunch
-click "role=button label=General"
+click "role=cell label=General || role=button label=General"
 wait 1000
 find text "About" exists
 

test/integration/replays/macos/01-system-settings.ad

@@ -4,7 +4,7 @@ open "System Settings" --relaunch
 screenshot "./test/screenshots/replays/macos-system-settings.png"
 appstate
 snapshot -i
-click "role=button label=General"
+click "role=cell label=General || role=button label=General"
 wait "role=button label=About" 5000
 snapshot -i
 is exists "role=button label=About"