appium-webdriveragent 3.14.0 → 4.0.0

package/WebDriverAgentLib/Utilities/FBReflectionUtils.m

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "FBReflectionUtils.h"
+
+#import <objc/runtime.h>
+
+void FBReplaceMethod(Class class, SEL originalSelector, SEL swizzledSelector) {
+  Method originalMethod = class_getInstanceMethod(class, originalSelector);
+  Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
+
+  BOOL didAddMethod =
+  class_addMethod(class,
+                  originalSelector,
+                  method_getImplementation(swizzledMethod),
+                  method_getTypeEncoding(swizzledMethod));
+
+  if (didAddMethod) {
+    class_replaceMethod(class,
+                        swizzledSelector,
+                        method_getImplementation(originalMethod),
+                        method_getTypeEncoding(originalMethod));
+  } else {
+    method_exchangeImplementations(originalMethod, swizzledMethod);
+  }
+}

package/WebDriverAgentLib/Utilities/FBScreen.m

@@ -35,7 +35,9 @@
   if (!mainStatusBar || (expectVisibleBar && !mainStatusBar.fb_isVisible)) {
     return CGSizeZero;
   }
-  return mainStatusBar.frame.size;
+  CGSize result = mainStatusBar.frame.size;
+  // Workaround for https://github.com/appium/appium/issues/15961
+  return CGSizeMake(MAX(result.width, result.height), MIN(result.width, result.height));
 }
 
 @end

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m

@@ -13,9 +13,10 @@
 
 #import "FBConfiguration.h"
 #import "FBLogger.h"
+#import "FBMacros.h"
+#import "FBReflectionUtils.h"
 #import "XCAXClient_iOS.h"
 #import "XCUIDevice.h"
-#import "FBMacros.h"
 
 static id FBAXClient = nil;
 
@@ -35,28 +36,9 @@ static id FBAXClient = nil;
 {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-      Class class = [self class];
-
-      SEL originalSelector = @selector(defaultParameters);
-      SEL swizzledSelector = @selector(fb_getParametersForElementSnapshot);
-
-      Method originalMethod = class_getInstanceMethod(class, originalSelector);
-      Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
-
-      BOOL didAddMethod =
-          class_addMethod(class,
-              originalSelector,
-              method_getImplementation(swizzledMethod),
-              method_getTypeEncoding(swizzledMethod));
-
-      if (didAddMethod) {
-          class_replaceMethod(class,
-              swizzledSelector,
-              method_getImplementation(originalMethod),
-              method_getTypeEncoding(originalMethod));
-      } else {
-          method_exchangeImplementations(originalMethod, swizzledMethod);
-      }
+    SEL originalParametersSelector = @selector(defaultParameters);
+    SEL swizzledParametersSelector = @selector(fb_getParametersForElementSnapshot);
+    FBReplaceMethod([self class], originalParametersSelector, swizzledParametersSelector);
   });
 }
 

package/WebDriverAgentLib/Utilities/FBXMLGenerationOptions.h

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FBXMLGenerationOptions : NSObject
+
+/**
+ XML buidling scope. Passing nil means the XML should be built in the default scope,
+ i.e no changes to the original tree structore. If the scope is provided then the resulting
+ XML tree will be put under the root, which name is equal to the given scope value.
+ */
+@property (nonatomic, nullable) NSString *scope;
+/**
+ The list of attribute names to exclude from the resulting document.
+ Passing nil means all the available attributes should be included
+ */
+@property (nonatomic, nullable) NSArray<NSString *> *excludedAttributes;
+
+/**
+ Allows to provide XML scope.
+
+ @param scope See the property description above
+ @return self instance for chaining
+ */
+- (FBXMLGenerationOptions *)withScope:(nullable NSString *)scope;
+
+/**
+ Allows to provide a list of excluded XML attributes.
+
+ @param excludedAttributes See the property description above
+ @return self instance for chaining
+ */
+- (FBXMLGenerationOptions *)withExcludedAttributes:(nullable NSArray<NSString *> *)excludedAttributes;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBXMLGenerationOptions.m

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "FBXMLGenerationOptions.h"
+
+@implementation FBXMLGenerationOptions
+
+- (FBXMLGenerationOptions *)withScope:(NSString *)scope
+{
+  self.scope = scope;
+  return self;
+}
+
+- (FBXMLGenerationOptions *)withExcludedAttributes:(NSArray<NSString *> *)excludedAttributes
+{
+  self.excludedAttributes = excludedAttributes;
+  return self;
+}
+
+@end

package/WebDriverAgentLib/Utilities/FBXPath.h

@@ -27,6 +27,8 @@
 #pragma clang diagnostic pop
 #endif
 
+@class FBXMLGenerationOptions;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FBXPath : NSObject
@@ -47,12 +49,11 @@ NS_ASSUME_NONNULL_BEGIN
  representation, which is used for XPath search
  
  @param root the root element
- @param excludedAttributes the list of attribute names to exclude from the resulting document.
- Passing nil means all the available attributes should be included
+ @param options Optional values that affect the resulting XML creation process
  @return valid XML document as string or nil in case of failure
  */
 + (nullable NSString *)xmlStringWithRootElement:(id<FBElement>)root
-                            excludingAttributes:(nullable NSArray<NSString *> *)excludedAttributes;
+                                        options:(nullable FBXMLGenerationOptions *)options;
 
 @end
 

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -12,6 +12,7 @@
 #import "FBConfiguration.h"
 #import "FBExceptions.h"
 #import "FBLogger.h"
+#import "FBXMLGenerationOptions.h"
 #import "NSString+FBXMLSafeString.h"
 #import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIElement.h"
@@ -117,15 +118,45 @@ static NSString *const topNodeIndexPath = @"top";
 }
 
 + (nullable NSString *)xmlStringWithRootElement:(id<FBElement>)root
-                            excludingAttributes:(nullable NSArray<NSString *> *)excludedAttributes
+                                        options:(nullable FBXMLGenerationOptions *)options
 {
   xmlDocPtr doc;
   xmlTextWriterPtr writer = xmlNewTextWriterDoc(&doc, 0);
-  int rc = [self xmlRepresentationWithRootElement:root
+  int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
+  if (rc < 0) {
+    [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
+  } else {
+    BOOL hasScope = nil != options.scope && [options.scope length] > 0;
+    if (hasScope) {
+      rc = xmlTextWriterStartElement(writer,
+                                     (xmlChar *)[[self safeXmlStringWithString:options.scope] UTF8String]);
+      if (rc < 0) {
+        [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartElement for the tag value '%@'. Error code: %d", options.scope, rc];
+      }
+    }
+
+    if (rc >= 0) {
+      rc = [self xmlRepresentationWithRootElement:root
                                            writer:writer
                                      elementStore:nil
                                             query:nil
-                              excludingAttributes:excludedAttributes];
+                              excludingAttributes:options.excludedAttributes];
+    }
+
+    if (rc >= 0 && hasScope) {
+      rc = xmlTextWriterEndElement(writer);
+      if (rc < 0) {
+        [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndElement. Error code: %d", rc];
+      }
+    }
+
+    if (rc >= 0) {
+      rc = xmlTextWriterEndDocument(writer);
+      if (rc < 0) {
+        [FBLogger logFmt:@"Failed to invoke libxml2>xmlXPathNewContext. Error code: %d", rc];
+      }
+    }
+  }
   if (rc < 0) {
     xmlFreeTextWriter(writer);
     xmlFreeDoc(doc);
@@ -141,7 +172,8 @@ static NSString *const topNodeIndexPath = @"top";
   return result;
 }
 
-+ (NSArray<XCElementSnapshot *> *)matchesWithRootElement:(id<FBElement>)root forQuery:(NSString *)xpathQuery
++ (NSArray<XCElementSnapshot *> *)matchesWithRootElement:(id<FBElement>)root
+                                                forQuery:(NSString *)xpathQuery
 {
   xmlDocPtr doc;
 
@@ -151,11 +183,22 @@ static NSString *const topNodeIndexPath = @"top";
     return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
   }
   NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
-  int rc = [self xmlRepresentationWithRootElement:root
-                                           writer:writer
-                                     elementStore:elementStore
-                                            query:xpathQuery
-                              excludingAttributes:nil];
+  int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
+  if (rc < 0) {
+    [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
+  } else {
+    rc = [self xmlRepresentationWithRootElement:root
+                                         writer:writer
+                                   elementStore:elementStore
+                                          query:xpathQuery
+                            excludingAttributes:nil];
+    if (rc >= 0) {
+      rc = xmlTextWriterEndDocument(writer);
+      if (rc < 0) {
+        [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndDocument. Error code: %d", rc];
+      }
+    }
+  }
   if (rc < 0) {
     xmlFreeTextWriter(writer);
     xmlFreeDoc(doc);
@@ -169,7 +212,8 @@ static NSString *const topNodeIndexPath = @"top";
     return [self throwException:FBInvalidXPathException forQuery:xpathQuery];
   }
 
-  NSArray *matchingSnapshots = [self collectMatchingSnapshots:queryResult->nodesetval elementStore:elementStore];
+  NSArray *matchingSnapshots = [self collectMatchingSnapshots:queryResult->nodesetval
+                                                 elementStore:elementStore];
   xmlXPathFreeObject(queryResult);
   xmlFreeTextWriter(writer);
   xmlFreeDoc(doc);
@@ -179,7 +223,8 @@ static NSString *const topNodeIndexPath = @"top";
   return matchingSnapshots;
 }
 
-+ (NSArray *)collectMatchingSnapshots:(xmlNodeSetPtr)nodeSet elementStore:(NSMutableDictionary *)elementStore
++ (NSArray *)collectMatchingSnapshots:(xmlNodeSetPtr)nodeSet
+                         elementStore:(NSMutableDictionary *)elementStore
 {
   if (xmlXPathNodeSetIsEmpty(nodeSet)) {
     return @[];
@@ -243,26 +288,15 @@ static NSString *const topNodeIndexPath = @"top";
   }
   [FBLogger logFmt:@"The following attributes were requested to be included into the XML: %@", includedAttributes];
 
-  int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
-  if (rc < 0) {
-    [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
-    return rc;
-  }
-
-  rc = [self writeXmlWithRootElement:root
-                           indexPath:(elementStore != nil ? topNodeIndexPath : nil)
-                        elementStore:elementStore
-                  includedAttributes:includedAttributes.copy
-                              writer:writer];
+  int rc = [self writeXmlWithRootElement:root
+                               indexPath:(elementStore != nil ? topNodeIndexPath : nil)
+                            elementStore:elementStore
+                      includedAttributes:includedAttributes.copy
+                                  writer:writer];
   if (rc < 0) {
     [FBLogger log:@"Failed to generate XML presentation of a screen element"];
     return rc;
   }
-  rc = xmlTextWriterEndDocument(writer);
-  if (rc < 0) {
-    [FBLogger logFmt:@"Failed to invoke libxml2>xmlXPathNewContext. Error code: %d", rc];
-    return rc;
-  }
   return 0;
 }
 
@@ -290,7 +324,10 @@ static NSString *const topNodeIndexPath = @"top";
   return [str fb_xmlSafeStringWithReplacement:@""];
 }
 
-+ (int)recordElementAttributes:(xmlTextWriterPtr)writer forElement:(XCElementSnapshot *)element indexPath:(nullable NSString *)indexPath includedAttributes:(nullable NSSet<Class> *)includedAttributes
++ (int)recordElementAttributes:(xmlTextWriterPtr)writer
+                    forElement:(XCElementSnapshot *)element
+                     indexPath:(nullable NSString *)indexPath
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
 {
   for (Class attributeCls in FBElementAttribute.supportedAttributes) {
     // include all supported attributes by default unless enumerated explicitly

package/WebDriverAgentRunner/UITestingUITests.m

@@ -25,6 +25,7 @@
   [FBDebugLogDelegateDecorator decorateXCTestLogger];
   [FBConfiguration disableRemoteQueryEvaluation];
   [FBConfiguration configureDefaultKeyboardPreferences];
+  [FBConfiguration disableApplicationUIInterruptionsHandling];
   if (NSProcessInfo.processInfo.environment[@"ENABLE_AUTOMATIC_SCREENSHOTS"]) {
     [FBConfiguration enableScreenshots];
   } else {

package/WebDriverAgentTests/IntegrationTests/FBAlertTests.m

@@ -29,6 +29,7 @@
   dispatch_once(&onceToken, ^{
     [self launchApplication];
     [self goToAlertsPage];
+    [FBConfiguration disableApplicationUIInterruptionsHandling];
   });
   [self clearAlert];
 }
@@ -163,6 +164,11 @@
   FBAssertWaitTillBecomesTrue(alert.isPresent);
 
   XCTAssertTrue([alert.text containsString:@"Would Like to Access Your Photos"]);
+  // iOS 15 has different UI flow
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    [[FBAlert alertWithApplication:self.testedApplication] dismissWithError:nil];
+    [self.testedApplication.buttons[@"Cancel"] tap];
+  }
 }
 
 - (void)testGPSAccessAlert

package/WebDriverAgentTests/IntegrationTests/FBAppiumMultiTouchActionsIntegrationTests.m

@@ -11,6 +11,7 @@
 
 #import "FBIntegrationTestCase.h"
 
+#import "FBMacros.h"
 #import "XCUIElement.h"
 #import "XCUIApplication+FBTouchAction.h"
 #import "FBTestMacros.h"
@@ -132,6 +133,12 @@
 
 - (void)testMultiTouchWithMultiTaps
 {
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // Does not work on iOS 15.
+    // It tapped two times, but one was touch count was one. Not two finguer taps.
+    return;
+  }
+
   XCUIElement *touchableView = self.testedApplication.otherElements[@"touchableView"];
   XCTAssertNotNil(touchableView);
   NSArray<NSArray<NSDictionary<NSString *, id> *>*> *gesture =

package/WebDriverAgentTests/IntegrationTests/FBAppiumTouchActionsIntegrationTests.m

@@ -194,6 +194,14 @@
 
 - (void)testDoubleTap
 {
+  if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad &&
+      SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // "tap the element" does not work on iPadOS simulator after change the rotation in iOS 15
+    // while selecting the element worked. (I confirmed with getting an element screenshot that
+    // the FBShowAlertButtonName was actually selected after changing the orientation.)
+    return;
+  }
+
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"tap",
@@ -208,6 +216,13 @@
 
 - (void)testPress
 {
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // Does not work on iOS 15.0.
+    // The same action tap the FBShowAlertButtonName after rotating the screen
+    // worked with W3C actions. `.click` action did not work.
+    return;
+  }
+
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"press",
@@ -271,6 +286,10 @@
 
 - (void)testForcePress
 {
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // Does not work on iOS 15.
+    return;
+  }
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"press",

package/WebDriverAgentTests/IntegrationTests/FBElementScreenshotTests.m

@@ -51,6 +51,10 @@
   XCTAssertTrue(image.size.width > image.size.height);
 
   XCUIScreen *mainScreen = XCUIScreen.mainScreen;
+  // Note about iPadOS 15.0 environment.
+  // The 'button.screenshot.image' (by XCTest) had a white image while 'image' had
+  // expected FBShowAlertButtonName area image by WebDriverAgent.
+  // It seems the native XCTest element screenshot has an issue on iPadOS.
   UIImage *buttonScreenshot = button.screenshot.image;
   XCTAssertEqualWithAccuracy(buttonScreenshot.size.height * mainScreen.scale,
                              image.size.height,

package/WebDriverAgentTests/IntegrationTests/FBElementSwipingTests.m

@@ -17,19 +17,38 @@
 
 @interface FBElementSwipingTests : FBIntegrationTestCase
 @property (nonatomic, strong) XCUIElement *scrollView;
+- (void)openScrollView;
 @end
 
 @implementation FBElementSwipingTests
 
+- (void)openScrollView
+{
+  [self launchApplication];
+  [self goToScrollPageWithCells:YES];
+  self.scrollView = [[self.testedApplication.query descendantsMatchingType:XCUIElementTypeAny] matchingIdentifier:@"scrollView"].element;
+}
+
 - (void)setUp
 {
   [super setUp];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    [self launchApplication];
-    [self goToScrollPageWithCells:YES];
-    self.scrollView = [[self.testedApplication.query descendantsMatchingType:XCUIElementTypeAny] matchingIdentifier:@"scrollView"].element;
-  });
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    [self openScrollView];
+  } else {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+      [self openScrollView];
+    });
+  }
+}
+
+- (void)tearDown
+{
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // Move to top page once to reset the scroll place
+    // since iOS 15 seems cannot handle cell visibility well when the view keps the view
+    [self.testedApplication terminate];
+  }
 }
 
 - (void)testSwipeUp
@@ -55,3 +74,49 @@
 }
 
 @end
+
+@interface FBElementSwipingApplicationTests : FBIntegrationTestCase
+@property (nonatomic, strong) XCUIElement *scrollView;
+- (void)openScrollView;
+@end
+
+@implementation FBElementSwipingApplicationTests
+
+- (void)openScrollView
+{
+  [self launchApplication];
+  [self goToScrollPageWithCells:YES];
+}
+
+- (void)setUp
+{
+  [super setUp];
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    [self openScrollView];
+  });
+}
+
+- (void)testSwipeUp
+{
+  [self.testedApplication fb_swipeWithDirection:@"up" velocity:nil];
+  FBAssertInvisibleCell(@"0");
+}
+
+- (void)testSwipeDown
+{
+  [self.testedApplication fb_swipeWithDirection:@"up" velocity:nil];
+  FBAssertInvisibleCell(@"0");
+  [self.testedApplication fb_swipeWithDirection:@"down" velocity:nil];
+  FBAssertVisibleCell(@"0");
+}
+
+- (void)testSwipeDownWithVelocity
+{
+  [self.testedApplication fb_swipeWithDirection:@"up" velocity:@2500];
+  FBAssertInvisibleCell(@"0");
+  [self.testedApplication fb_swipeWithDirection:@"down" velocity:@2500];
+  FBAssertVisibleCell(@"0");
+}
+
+@end

package/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

@@ -30,7 +30,9 @@
   [self goToSpringBoardFirstPage];
 
   // Check Icons on first screen
-  XCTAssertTrue(self.springboard.icons[@"Calendar"].fb_isVisible);
+  // Note: Calender app exits 2 (an app icon + a widget) exist on the home screen
+  // on iOS 15+. The firstMatch is for it.
+  XCTAssertTrue(self.springboard.icons[@"Calendar"].firstMatch.fb_isVisible);
   XCTAssertTrue(self.springboard.icons[@"Reminders"].fb_isVisible);
 
   // Check Icons on second screen screen

package/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m

@@ -11,6 +11,7 @@
 
 #import "FBIntegrationTestCase.h"
 
+#import "FBMacros.h"
 #import "FBElementCache.h"
 #import "FBTestMacros.h"
 #import "XCUIDevice+FBRotation.h"
@@ -53,6 +54,11 @@
 
 - (void)testForceTap
 {
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // Does not work on iOS 15.
+    return;
+  }
+
   [self verifyForceTapWithOrientation:UIDeviceOrientationPortrait];
 }
 

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -43,6 +43,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
   [FBConfiguration disableRemoteQueryEvaluation];
   [FBConfiguration disableAttributeKeyPathAnalysis];
   [FBConfiguration configureDefaultKeyboardPreferences];
+  [FBConfiguration disableApplicationUIInterruptionsHandling];
   [FBConfiguration disableScreenshots];
   self.continueAfterFailure = NO;
   self.springboard = FBApplication.fb_systemApplication;
@@ -93,7 +94,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
   FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
   [[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
   [self.testedApplication fb_waitUntilStable];
-  FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].fb_isVisible);
+  FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
 }
 
 - (void)goToSpringBoardExtras

package/WebDriverAgentTests/IntegrationTests/FBKeyboardTests.m

@@ -9,6 +9,7 @@
 
 #import <XCTest/XCTest.h>
 
+#import "FBMacros.h"
 #import "FBIntegrationTestCase.h"
 #import "FBKeyboard.h"
 #import "FBRunLoopSpinner.h"
@@ -31,6 +32,15 @@
   NSString *text = @"Happy typing";
   XCUIElement *textField = self.testedApplication.textFields[@"aIdentifier"];
   [textField tap];
+
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // A workaround until find out to clear tutorial on iOS 15
+    XCUIElement *textField = self.testedApplication.staticTexts[@"Continue"];
+    if (textField.hittable) {
+      [textField tap];
+    }
+  }
+
   NSError *error;
   XCTAssertTrue([FBKeyboard waitUntilVisibleForApplication:self.testedApplication timeout:1 error:&error]);
   XCTAssertNil(error);
@@ -43,6 +53,15 @@
 {
   XCUIElement *textField = self.testedApplication.textFields[@"aIdentifier"];
   [textField tap];
+
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // A workaround until find out to clear tutorial on iOS 15
+    XCUIElement *textField = self.testedApplication.staticTexts[@"Continue"];
+    if (textField.hittable) {
+      [textField tap];
+    }
+  }
+
   NSError *error;
   XCTAssertTrue([FBKeyboard waitUntilVisibleForApplication:self.testedApplication timeout:1 error:&error]);
   XCTAssertNil(error);

package/WebDriverAgentTests/IntegrationTests/FBW3CTouchActionsIntegrationTests.m

@@ -295,6 +295,14 @@
 
 - (void)testDoubleTap
 {
+  if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad &&
+      SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // "tap the element" does not work on iPadOS simulator after change the rotation in iOS 15
+    // while selecting the element worked. (I confirmed with getting an element screenshot that
+    // the FBShowAlertButtonName was actually selected after changing the orientation.)
+    return;
+  }
+
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"type": @"pointer",
@@ -317,6 +325,13 @@
 
 - (void)testLongPressWithCombinedPause
 {
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
+    // Xcode 13 x iOS 14 also does not work while Xcode 12.5 x iOS 14 worked.
+    // Skip this test for iOS 15 since iOS 15 works with Xcode 13 at least.
+    return;
+  }
+
+
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"type": @"pointer",