appium-webdriveragent 9.3.2 → 9.4.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [9.4.0](https://github.com/appium/WebDriverAgent/compare/v9.3.3...v9.4.0) (2025-04-02)
+
+### Features
+
+* Always apply the native snapshotting strategy for XCUIApplication instances ([#998](https://github.com/appium/WebDriverAgent/issues/998)) ([60f5aef](https://github.com/appium/WebDriverAgent/commit/60f5aeffdda85faffd60aba416dc9d92987f19ac))
+
+## [9.3.3](https://github.com/appium/WebDriverAgent/compare/v9.3.2...v9.3.3) (2025-03-27)
+
+### Bug Fixes
+
+* Properly set snapshot lookup scope if limitXpathContextScope is disabled ([#996](https://github.com/appium/WebDriverAgent/issues/996)) ([03ca7cd](https://github.com/appium/WebDriverAgent/commit/03ca7cd27b7cd92a45b344eb661db973c5dde809))
+
 ## [9.3.2](https://github.com/appium/WebDriverAgent/compare/v9.3.1...v9.3.2) (2025-03-26)
 
 ### Bug Fixes

package/WebDriverAgentLib/Categories/XCUIElement+FBFind.m

@@ -12,6 +12,7 @@
 
 #import "FBMacros.h"
 #import "FBElementTypeTransformer.h"
+#import "FBConfiguration.h"
 #import "NSPredicate+FBFormat.h"
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
@@ -109,8 +110,9 @@
     id<FBXCElementSnapshot> snapshot = matchingSnapshots.firstObject;
     matchingSnapshots = @[snapshot];
   }
-  return [self fb_filterDescendantsWithSnapshots:matchingSnapshots
-                                    onlyChildren:NO];
+  XCUIElement *scopeRoot = FBConfiguration.limitXpathContextScope ? self : self.application;
+  return [scopeRoot fb_filterDescendantsWithSnapshots:matchingSnapshots
+                                         onlyChildren:NO];
 }
 
 

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -49,7 +49,7 @@
   __block id<FBXCElementSnapshot> snapshot = nil;
   @autoreleasepool {
     NSError *error = nil;
-    snapshot = inDepth
+    snapshot = inDepth && ![self isKindOfClass:XCUIApplication.class]
       ? [self.fb_query fb_uniqueSnapshotWithError:&error]
       : (id<FBXCElementSnapshot>)[self snapshotWithError:&error];
     if (nil == snapshot) {

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>9.3.2</string>
+    <string>9.4.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>9.3.2</string>
+    <string>9.4.0</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m

@@ -108,12 +108,24 @@
                           [FBXCElementSnapshotWrapper ensureWrapped:[parentSnapshots objectAtIndex:0]].wdLabel,
                           @"MainView"
                           );
+    NSArray *elements = [button.application fb_filterDescendantsWithSnapshots:parentSnapshots onlyChildren:NO];
+    XCTAssertEqual(elements.count, 1);
+    XCTAssertEqualObjects(
+                          [[elements objectAtIndex:0] wdLabel],
+                          @"MainView"
+                          );
     NSArray *currentSnapshots = [FBXPath matchesWithRootElement:button forQuery:@"."];
     XCTAssertEqual(currentSnapshots.count, 1);
     XCTAssertEqualObjects(
                           [FBXCElementSnapshotWrapper ensureWrapped:[currentSnapshots objectAtIndex:0]].wdType,
                           @"XCUIElementTypeButton"
                           );
+    NSArray *currentElements = [button.application fb_filterDescendantsWithSnapshots:currentSnapshots onlyChildren:NO];
+    XCTAssertEqual(currentElements.count, 1);
+    XCTAssertEqualObjects(
+                          [[currentElements objectAtIndex:0] wdType],
+                          @"XCUIElementTypeButton"
+                          );
   } @finally {
     FBConfiguration.limitXpathContextScope = previousValue;
   }

package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m

@@ -20,6 +20,23 @@
 #import "XCUIElement+FBIsVisible.h"
 #import "FBXCodeCompatibility.h"
 
+void calculateMaxTreeDepth(NSDictionary *tree, NSNumber *currentDepth, NSNumber** maxDepth) {
+  if (nil == maxDepth) {
+    return;
+  }
+
+  NSArray *children = tree[@"children"];
+  if (nil == children || 0 == children.count) {
+    return;
+  }
+  for (NSDictionary *child in children) {
+    if (currentDepth.integerValue > [*maxDepth integerValue]) {
+      *maxDepth = currentDepth;
+    }
+    calculateMaxTreeDepth(child, @(currentDepth.integerValue + 1), maxDepth);
+  }
+}
+
 @interface XCUIApplicationHelperTests : FBIntegrationTestCase
 @end
 
@@ -40,7 +57,11 @@
 
 - (void)testApplicationTree
 {
-  XCTAssertNotNil(self.testedApplication.fb_tree);
+  NSDictionary *tree = self.testedApplication.fb_tree;
+  XCTAssertNotNil(tree);
+  NSNumber *maxDepth;
+  calculateMaxTreeDepth(tree, @0, &maxDepth);
+  XCTAssertGreaterThan(maxDepth.integerValue, 3);
   XCTAssertNotNil(self.testedApplication.fb_accessibilityTree);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "9.3.2",
+  "version": "9.4.0",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",