fix: Use native snapshots if hittable attribute is requested in xPath

Author: mykola-mokhnach

WebDriverAgentLib/Utilities/FBXPath.m

@@ -146,7 +146,8 @@ + (nullable NSString *)xmlStringWithRootElement:(id<FBElement>)root
     }
 
     if (rc >= 0) {
-      rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root]
+      [self waitUntilStableWithElement:root];
+      rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root useNative:NO]
                                            writer:writer
                                      elementStore:nil
                                             query:nil
@@ -196,17 +197,23 @@ + (nullable NSString *)xmlStringWithRootElement:(id<FBElement>)root
   int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
   id<FBXCElementSnapshot> lookupScopeSnapshot = nil;
   id<FBXCElementSnapshot> contextRootSnapshot = nil;
+  BOOL useNativeSnapshot = nil == xpathQuery
+    ? NO
+    : [[self.class elementAttributesWithXPathQuery:xpathQuery] containsObject:FBHittableAttribute.class];
   if (rc < 0) {
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
   } else {
+    [self waitUntilStableWithElement:root];
     if (FBConfiguration.limitXpathContextScope) {
-      lookupScopeSnapshot = [self snapshotWithRoot:root];
+      lookupScopeSnapshot = [self snapshotWithRoot:root useNative:useNativeSnapshot];
     } else {
       if ([root isKindOfClass:XCUIElement.class]) {
-        lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]];
+        lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]
+                                           useNative:useNativeSnapshot];
         contextRootSnapshot = [root isKindOfClass:XCUIApplication.class]
           ? nil
-          : ([(XCUIElement *)root lastSnapshot] ?: [(XCUIElement *)root fb_customSnapshot]);
+          : ([(XCUIElement *)root lastSnapshot] ?: [self snapshotWithRoot:(XCUIElement *)root
+                                                                useNative:useNativeSnapshot]);
       } else {
         lookupScopeSnapshot = (id<FBXCElementSnapshot>)root;
         contextRootSnapshot = nil == lookupScopeSnapshot.parent ? nil : (id<FBXCElementSnapshot>)root;
@@ -483,19 +490,29 @@ + (int)writeXmlWithRootElement:(id<FBXCElementSnapshot>)root
 }
 
 + (id<FBXCElementSnapshot>)snapshotWithRoot:(id<FBElement>)root
+                                  useNative:(BOOL)useNative
 {
   if (![root isKindOfClass:XCUIElement.class]) {
     return (id<FBXCElementSnapshot>)root;
   }
 
-  // If the app is not idle state while we retrieve the visiblity state
-  // then the snapshot retrieval operation might freeze and time out
-  [[(XCUIElement *)root application] fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  if (useNative) {
+    return [(XCUIElement *)root fb_nativeSnapshot];
+  }
   return [root isKindOfClass:XCUIApplication.class]
     ? [(XCUIElement *)root fb_standardSnapshot]
     : [(XCUIElement *)root fb_customSnapshot];
 }
 
++ (void)waitUntilStableWithElement:(id<FBElement>)root
+{
+  if ([root isKindOfClass:XCUIElement.class]) {
+    // If the app is not idle state while we retrieve the visiblity state
+    // then the snapshot retrieval operation might freeze and time out
+    [[(XCUIElement *)root application] fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  }
+}
+
 @end
 
 

WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -461,4 +461,13 @@ - (void)testInvisibleDescendantWithXPathQuery
   XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
 }
 
+- (void)testNonHittableDescendantWithXPathQuery
+{
+  NSArray<XCUIElement *> *matchingSnapshots = [self.testedApplication fb_descendantsMatchingXPathQuery:@"//XCUIElementTypeStaticText[@hittable='false']"
+                                                                           shouldReturnAfterFirstMatch:NO];
+  XCTAssertGreaterThan(matchingSnapshots.count, 1);
+  XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypeStaticText);
+  XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
+}
+
 @end

WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h

@@ -28,6 +28,7 @@
 @property (nonatomic, strong, readwrite, nullable) NSString *wdValue;
 @property (nonatomic, readwrite, getter=isWDEnabled) BOOL wdEnabled;
 @property (nonatomic, readwrite, getter=isWDSelected) BOOL wdSelected;
+@property (nonatomic, readwrite, assign) CGRect wdNativeFrame;
 @property (nonatomic, readwrite) NSUInteger wdIndex;
 @property (nonatomic, readwrite, getter=isWDVisible) BOOL wdVisible;
 @property (nonatomic, readwrite, getter=isWDAccessible) BOOL wdAccessible;

WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m

@@ -19,7 +19,8 @@ - (id)init
 {
   self = [super init];
   if (self) {
-    self.wdFrame = CGRectMake(0, 0, 0, 0);
+    self.wdFrame = CGRectZero;
+    self.wdNativeFrame = CGRectZero;
     self.wdName = @"testName";
     self.wdLabel = @"testLabel";
     self.wdValue = @"magicValue";