fix tests

Author: mykola-mokhnach

WebDriverAgentLib/Categories/XCUIElement+FBUtilities.h

@@ -49,17 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (id<FBXCElementSnapshot>)fb_customSnapshot;
 
-/**
- Gets the most recent snapshot of the current element. The element will be
- automatically resolved if the snapshot is not available yet.
- Calls to this method mutate the `lastSnapshot` instance property..
-
- @param maxDepth Allows to customize the maximum depth of the snapshot tree
- @return The recent snapshot of the element
- @throws FBStaleElementException if the element is not present in DOM and thus no snapshot could be made
- */
-- (id<FBXCElementSnapshot>)fb_customSnapshotWithMaxDepth:(NSUInteger)maxDepth;
-
 /**
  Extracts the cached element snapshot from its query.
  No requests to the accessiblity framework is made.

WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -44,23 +44,14 @@
 
 @implementation XCUIElement (FBUtilities)
 
-- (id<FBXCElementSnapshot>)fb_takeSnapshot:(BOOL)isCustom maxDepth:(nullable NSNumber *)maxDepth
+- (id<FBXCElementSnapshot>)fb_takeSnapshot:(BOOL)isCustom
 {
   __block id<FBXCElementSnapshot> snapshot = nil;
   @autoreleasepool {
     NSError *error = nil;
-    if (isCustom) {
-      int previousMaxDepth = FBConfiguration.snapshotMaxDepth;
-      if (nil != maxDepth) {
-        FBConfiguration.snapshotMaxDepth = maxDepth.unsignedIntValue;
-      }
-      snapshot = [self.fb_query fb_uniqueSnapshotWithError:&error];
-      if (nil != maxDepth) {
-        FBConfiguration.snapshotMaxDepth = previousMaxDepth;
-      }
-    } else {
-      snapshot = (id<FBXCElementSnapshot>)[self snapshotWithError:&error];
-    }
+    snapshot = isCustom
+      ? [self.fb_query fb_uniqueSnapshotWithError:&error]
+      : (id<FBXCElementSnapshot>)[self snapshotWithError:&error];
     if (nil == snapshot) {
       NSString *hintText = @"Make sure the application UI has the expected state";
       if (nil != error && [error.localizedDescription containsString:@"Identity Binding"]) {
@@ -80,17 +71,12 @@ @implementation XCUIElement (FBUtilities)
 
 - (id<FBXCElementSnapshot>)fb_standardSnapshot
 {
-  return [self fb_takeSnapshot:NO maxDepth:nil];
+  return [self fb_takeSnapshot:NO];
 }
 
 - (id<FBXCElementSnapshot>)fb_customSnapshot
 {
-  return [self fb_takeSnapshot:YES maxDepth:nil];
-}
-
-- (id<FBXCElementSnapshot>)fb_customSnapshotWithMaxDepth:(NSUInteger)maxDepth
-{
-  return [self fb_takeSnapshot:YES maxDepth:@(maxDepth)];
+  return [self fb_takeSnapshot:YES];
 }
 
 - (id<FBXCElementSnapshot>)fb_cachedSnapshot

WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -28,14 +28,11 @@ @implementation XCUIElement (WebDriverAttributesForwarding)
 
 - (id<FBXCElementSnapshot>)fb_snapshotForAttributeName:(NSString *)name
 {
-  BOOL isValueRequest = [name isEqualToString:FBStringify(XCUIElement, wdValue)];
-  // https://github.com/appium/appium-xcuitest-driver/issues/2552
-  if (isValueRequest) {
-    return [self fb_customSnapshotWithMaxDepth:1];
-  }
   BOOL isCustomSnapshot = ![self isKindOfClass:XCUIApplication.class]
     || [name isEqualToString:FBStringify(XCUIElement, isWDAccessible)]
     || [name isEqualToString:FBStringify(XCUIElement, isWDAccessibilityContainer)]
+    // https://github.com/appium/appium-xcuitest-driver/issues/2552
+    || [name isEqualToString:FBStringify(XCUIElement, wdValue)]
     || [name isEqualToString:FBStringify(XCUIElement, wdIndex)];
   return isCustomSnapshot ? [self fb_customSnapshot] : [self fb_standardSnapshot];
 }

WebDriverAgentLib/Commands/FBElementCommands.m

@@ -152,7 +152,7 @@ + (NSArray *)routes
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
   // https://github.com/appium/appium-xcuitest-driver/issues/2552
-  id<FBXCElementSnapshot> snapshot = [element fb_customSnapshotWithMaxDepth:1];
+  id<FBXCElementSnapshot> snapshot = [element fb_customSnapshot];
   FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
   id text = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel);
   return FBResponseWithObject(text ?: @"");

WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h

@@ -41,7 +41,6 @@
 - (void)resolve;
 - (id _Nonnull)fb_standardSnapshot;
 - (id _Nonnull)fb_customSnapshot;
-- (id _Nonnull)fb_customSnapshotWithMaxDepth:(NSUInteger)maxDepth;
 - (nullable id)query;
 
 // Checks

WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m

@@ -79,11 +79,6 @@ - (id _Nonnull)fb_customSnapshot;
   return [self lastSnapshot];
 }
 
-- (id _Nonnull)fb_customSnapshotWithMaxDepth:(NSUInteger)maxDepth
-{
-  return [self lastSnapshot];
-}
-
 - (NSString *)fb_cacheId
 {
   return self.wdUID;

WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.h

@@ -39,7 +39,6 @@
 - (void)resolve;
 - (id _Nonnull)fb_standardSnapshot;
 - (id _Nonnull)fb_customSnapshot;
-- (id _Nonnull)fb_customSnapshotWithMaxDepth:(NSUInteger)maxDepth;
 
 // Checks
 @property (nonatomic, assign, readonly) BOOL didResolve;

WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.m

@@ -62,11 +62,6 @@ - (id)fb_customSnapshot
   return [self lastSnapshot];
 }
 
-- (id _Nonnull)fb_customSnapshotWithMaxDepth:(NSUInteger)maxDepth
-{
-  return [self lastSnapshot];
-}
-
 - (void)resolve
 {
   self.didResolve = YES;