From 14982a27aea0d5aa9b42f47ddb0862b04ff0d566 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Wed, 13 Dec 2017 01:23:04 -0800
Subject: [PATCH 01/23] Remove TableView scrolling integration tests

Summary: We have duplicated scrolling tests for regular tableViews and simple scrollviews. It was usefull to have them, but now testing scrolling on scrollviews covers both cases anyway and we will waste less time testing.

Reviewed By: antiarchit

Differential Revision: D6543548

fbshipit-source-id: 35e717c43208b8f138a706798d9aa8a9e34b302a
---
 .../IntegrationTests/FBScrollingTests.m            | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m b/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m
index b32002cb46..aa7f898416 100644
--- a/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m
@@ -34,7 +34,7 @@ - (void)setUp
 {
   [super setUp];
   [self launchApplication];
-  [self goToScrollPageWithCells:[self.class shouldShowCells]];
+  [self goToScrollPageWithCells:NO];
   self.scrollView = [[self.testedApplication.query descendantsMatchingType:XCUIElementTypeAny] matchingIdentifier:@"scrollView"].element;
   [self.scrollView resolve];
 }
@@ -81,15 +81,3 @@ - (void)testFarScrollToVisible
 }
 
 @end
-
-@interface FBNoCellScrollingTests : FBScrollingTests
-@end
-
-@implementation FBNoCellScrollingTests
-
-+ (BOOL)shouldShowCells
-{
-  return NO;
-}
-
-@end

From 8c783d19677722f02de4bccb19a7d8544ba2c758 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Wed, 13 Dec 2017 01:28:50 -0800
Subject: [PATCH 02/23] Use fb_tapWithError in alert integration tests

Summary:
Some alert integration tests are flaky on our CI. I suspect this happens due to failing `tap` command, which might be failing to tap on animated view. This know XCTest issue.
Fortunately we have `fb_tapWithError` that handels are common pitfalls.

Reviewed By: antiarchit

Differential Revision: D6543616

fbshipit-source-id: f12ea7da67058253deff53fa980ebf2e55a93899
---
 WebDriverAgentTests/IntegrationTests/FBAlertTests.m        | 7 ++++---
 .../IntegrationTests/FBIntegrationTestCase.m               | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WebDriverAgentTests/IntegrationTests/FBAlertTests.m b/WebDriverAgentTests/IntegrationTests/FBAlertTests.m
index cf0ec9d3ca..a8cd54149e 100644
--- a/WebDriverAgentTests/IntegrationTests/FBAlertTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBAlertTests.m
@@ -13,6 +13,7 @@
 
 #import "FBIntegrationTestCase.h"
 #import "FBTestMacros.h"
+#import "XCUIElement+FBTap.h"
 
 @interface FBAlertTests : FBIntegrationTestCase
 @end
@@ -37,14 +38,14 @@ - (void)tearDown
 
 - (void)showApplicationAlert
 {
-  [self.testedApplication.buttons[FBShowAlertButtonName] tap];
+  [self.testedApplication.buttons[FBShowAlertButtonName] fb_tapWithError:nil];
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count != 0);
 }
 
 - (void)showApplicationSheet
 {
-    [self.testedApplication.buttons[FBShowSheetAlertButtonName] tap];
-    FBAssertWaitTillBecomesTrue(self.testedApplication.sheets.count != 0);
+  [self.testedApplication.buttons[FBShowSheetAlertButtonName] fb_tapWithError:nil];
+  FBAssertWaitTillBecomesTrue(self.testedApplication.sheets.count != 0);
 }
 
 - (void)testAlertException
diff --git a/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m b/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m
index c3b24d6427..2137b7acf7 100644
--- a/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m
+++ b/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m
@@ -63,6 +63,7 @@ - (void)goToAlertsPage
 {
   [self.testedApplication.buttons[@"Alerts"] tap];
   FBAssertWaitTillBecomesTrue(self.testedApplication.buttons[FBShowAlertButtonName].fb_isVisible);
+  FBAssertWaitTillBecomesTrue(self.testedApplication.buttons[FBShowSheetAlertButtonName].fb_isVisible);
 }
 
 - (void)goToSpringBoardFirstPage

From b4f85d96612a5f829c918e4a73405eb3854ce5d0 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Wed, 13 Dec 2017 01:31:14 -0800
Subject: [PATCH 03/23] Fix rotation integeation tests

Summary: Rather then depending on XCUITest information on orientation, we should test what is application perception

Reviewed By: antiarchit

Differential Revision: D6543511

fbshipit-source-id: 192e50d0202f96bd6119921c9353a72789b33ad4
---
 .../Categories/XCUIDevice+FBRotation.m        |  8 +++--
 .../IntegrationApp/Classes/ViewController.m   | 30 +++++++++++++++++++
 .../Resources/Base.lproj/Main.storyboard      | 19 +++++++++---
 .../XCUIDeviceRotationTests.m                 |  9 +++---
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m b/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m
index 7ff657a329..c25e0f1f70 100644
--- a/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m
+++ b/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m
@@ -30,19 +30,21 @@ - (BOOL)fb_setDeviceRotation:(NSDictionary *)rotationObj
   NSInteger orientation = keysForRotationObj.firstObject.integerValue;
   FBApplication *application = FBApplication.fb_activeApplication;
   [XCUIDevice sharedDevice].orientation = orientation;
-  return [self waitUntilInterfaceIsAtOrientation:[XCUIDevice sharedDevice].orientation application:application];
+  return [self waitUntilInterfaceIsAtOrientation:orientation application:application];
 }
 
 - (BOOL)waitUntilInterfaceIsAtOrientation:(NSInteger)orientation application:(FBApplication *)application
 {
   NSDate *startDate = [NSDate date];
-  while (![@(application.interfaceOrientation) isEqualToNumber:@(orientation)] && (-1 * [startDate timeIntervalSinceNow]) < kFBWebDriverOrientationChangeDelay) {
+  while (application.interfaceOrientation != orientation &&
+         [XCUIDevice sharedDevice].orientation != orientation &&
+         (-1 * [startDate timeIntervalSinceNow]) < kFBWebDriverOrientationChangeDelay) {
     CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.3, YES);
   }
   // Tapping elements immediately after rotation may fail due to way UIKit is handling touches.
   // We should wait till UI cools off, before continuing
   [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:FBRotationCoolOffTime]];
-  return [@(application.interfaceOrientation) isEqualToNumber:@(orientation)];
+  return application.interfaceOrientation == orientation;
 }
 
 - (NSDictionary *)fb_rotationMapping
diff --git a/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m b/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m
index 044e6b20ae..6014a56740 100644
--- a/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m
+++ b/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m
@@ -10,6 +10,7 @@
 #import "ViewController.h"
 
 @interface ViewController ()
+@property (weak, nonatomic) IBOutlet UILabel *orentationLabel;
 @end
 
 @implementation ViewController
@@ -26,4 +27,33 @@ - (IBAction)didTapButton:(UIButton *)button
   button.selected = !button.selected;
 }
 
+- (void)viewDidLayoutSubviews
+{
+  [super viewDidLayoutSubviews];
+  [self updateOrentationLabel];
+}
+
+- (void)updateOrentationLabel
+{
+  NSString *orientation = nil;
+  switch (self.interfaceOrientation) {
+    case UIInterfaceOrientationPortrait:
+      orientation = @"Portrait";
+      break;
+    case UIInterfaceOrientationPortraitUpsideDown:
+      orientation = @"PortraitUpsideDown";
+      break;
+    case UIInterfaceOrientationLandscapeLeft:
+      orientation = @"LandscapeLeft";
+      break;
+    case UIInterfaceOrientationLandscapeRight:
+      orientation = @"LandscapeRight";
+      break;
+    case UIInterfaceOrientationUnknown:
+      orientation = @"Unknown";
+      break;
+  }
+  self.orentationLabel.text = orientation;
+}
+
 @end
diff --git a/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard b/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard
index 183eff8f10..dc82b12b01 100644
--- a/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard
+++ b/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nJd-IZ-bfU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nJd-IZ-bfU">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -63,6 +63,12 @@
                                     <segue destination="YzO-du-v3Y" kind="show" animates="NO" id="Ds1-bA-25D"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Orientation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uiD-R4-b34">
+                                <rect key="frame" x="118" y="245" width="85" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <accessibility key="accessibilityConfiguration" label="MainView"/>
@@ -71,17 +77,22 @@
                             <constraint firstItem="S56-6U-3gG" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="8UW-Nz-F04"/>
                             <constraint firstItem="nbp-zX-Om1" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="Ahr-dg-qwa"/>
                             <constraint firstItem="nbp-zX-Om1" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="29" id="GcP-yp-Ze6"/>
+                            <constraint firstItem="uiD-R4-b34" firstAttribute="top" secondItem="S56-6U-3gG" secondAttribute="bottom" constant="8" id="SPc-4k-0MA"/>
                             <constraint firstItem="M2N-Yn-ytb" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="Yr3-Lt-qdn"/>
                             <constraint firstItem="YgP-SF-TkS" firstAttribute="top" secondItem="nbp-zX-Om1" secondAttribute="bottom" constant="8" id="b56-i5-Lxo"/>
+                            <constraint firstItem="uiD-R4-b34" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="nFx-Xr-rGC"/>
                             <constraint firstItem="S56-6U-3gG" firstAttribute="top" secondItem="M2N-Yn-ytb" secondAttribute="bottom" constant="8" id="rMW-LW-ejO"/>
                             <constraint firstItem="M2N-Yn-ytb" firstAttribute="top" secondItem="YgP-SF-TkS" secondAttribute="bottom" constant="8" id="tMN-gl-smg"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="dmu-Fe-aoT"/>
+                    <connections>
+                        <outlet property="orentationLabel" destination="uiD-R4-b34" id="ysn-P0-ADp"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="41" y="613"/>
+            <point key="canvasLocation" x="39.375" y="612.67605633802816"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="bWj-vr-GrF">
@@ -460,7 +471,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2mC-E2-VxB">
-                                            <rect key="frame" x="16" y="0.0" width="289" height="43.5"/>
+                                            <rect key="frame" x="16" y="0.0" width="288" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/WebDriverAgentTests/IntegrationTests/XCUIDeviceRotationTests.m b/WebDriverAgentTests/IntegrationTests/XCUIDeviceRotationTests.m
index d4bde47867..a4c5c02dea 100644
--- a/WebDriverAgentTests/IntegrationTests/XCUIDeviceRotationTests.m
+++ b/WebDriverAgentTests/IntegrationTests/XCUIDeviceRotationTests.m
@@ -8,6 +8,7 @@
  */
 
 #import <XCTest/XCTest.h>
+#import <UIKit/UIKit.h>
 #import "FBIntegrationTestCase.h"
 #import "XCUIDevice+FBRotation.h"
 
@@ -27,14 +28,14 @@ - (void)testLandscapeRightOrientation
 {
   BOOL success = [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationLandscapeRight];
   XCTAssertTrue(success, @"Device should support LandscapeRight");
-  XCTAssertEqual(UIDeviceOrientationLandscapeRight, [XCUIDevice sharedDevice].orientation, @"Device should be in landscape left mode");
+  XCTAssertTrue(self.testedApplication.staticTexts[@"LandscapeLeft"].exists); // Device rotation gives opposite interface rotation
 }
 
 - (void)testLandscapeLeftOrientation
 {
   BOOL success = [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationLandscapeLeft];
   XCTAssertTrue(success, @"Device should support LandscapeLeft");
-  XCTAssertEqual(UIDeviceOrientationLandscapeLeft, [XCUIDevice sharedDevice].orientation, @"Device should be in landscape right mode");
+  XCTAssertTrue(self.testedApplication.staticTexts[@"LandscapeRight"].exists); // Device rotation gives opposite interface rotation
 }
 
 - (void)testLandscapeRightRotation
@@ -45,7 +46,7 @@ - (void)testLandscapeRightRotation
     @"z" : @(90)
   }];
   XCTAssertTrue(success, @"Device should support LandscapeRight");
-  XCTAssertEqual(UIDeviceOrientationLandscapeRight, [XCUIDevice sharedDevice].orientation, @"Device should be in landscape left mode");
+  XCTAssertTrue(self.testedApplication.staticTexts[@"LandscapeLeft"].exists); // Device rotation gives opposite interface rotation
 }
 
 - (void)testLandscapeLeftRotation
@@ -56,7 +57,7 @@ - (void)testLandscapeLeftRotation
     @"z" : @(270)
   }];
   XCTAssertTrue(success, @"Device should support LandscapeLeft");
-  XCTAssertEqual(UIDeviceOrientationLandscapeLeft, [XCUIDevice sharedDevice].orientation, @"Device should be in landscape right mode");
+  XCTAssertTrue(self.testedApplication.staticTexts[@"LandscapeRight"].exists); // Device rotation gives opposite interface rotation
 }
 
 - (void)testRotationTiltRotation

From 70731919243416fca70de4b05d77558a6516ecb4 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Wed, 13 Dec 2017 03:07:01 -0800
Subject: [PATCH 04/23] Kill testExtrasIconContent

Summary:
This test is super device/simulator specific, that was used to interate on visibility improvements.
Right now it does not bring much value anyway.

Reviewed By: antiarchit

Differential Revision: D6543627

fbshipit-source-id: ffbda3b0b5ecde6a632e88030e84fae5af614347
---
 .../IntegrationTests/FBElementVisibilityTests.m   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m b/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
index 7bc35b9f73..a92bf219cd 100644
--- a/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
@@ -43,21 +43,6 @@ - (void)testSpringBoardSubfolder
   XCTAssertFalse(self.springboard.icons[@"Extras"].otherElements[@"Contacts"].fb_isVisible);
 }
 
-- (void)testExtrasIconContent
-{
-  if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
-    return;
-  }
-  [self launchApplication];
-  [self goToSpringBoardExtras];
-  [self.springboard.icons[@"Extras"] tap];
-  FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Contacts"].fb_isVisible);
-  NSArray *elements = self.springboard.pageIndicators.allElementsBoundByIndex;
-  for (XCUIElement *element in elements) {
-    XCTAssertFalse(element.fb_isVisible);
-  }
-}
-
 - (void)testIconsFromSearchDashboard
 {
   [self launchApplication];

From 74816e79c092122d2a31e97c40af3840330da7f8 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Wed, 10 Jan 2018 03:48:21 -0800
Subject: [PATCH 05/23] Use Xcode 9.2 and iOS 11.2 on Travis

Summary: It is time to move on.

Reviewed By: antiarchit

Differential Revision: D6692223

fbshipit-source-id: 81913167551191b2f9e177ff1ead943f6fc25752
---
 .travis.yml      | 2 +-
 Scripts/build.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f46556e254..4c16107dbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9.2
 sudo: false
 
 cache:
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 0fafc7ffeb..ec0487b0e5 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -20,8 +20,8 @@ function define_xc_macros() {
   esac
 
   case "${DEST:-}" in
-    "iphone" ) XC_DESTINATION="-destination \"name=iPhone SE,OS=10.3.1\"";;
-    "ipad" ) XC_DESTINATION="-destination \"name=iPad Air 2,OS=10.3.1\"";;
+    "iphone" ) XC_DESTINATION="-destination \"name=iPhone SE,OS=11.2\"";;
+    "ipad" ) XC_DESTINATION="-destination \"name=iPad Air 2,OS=11.2\"";;
   esac
 
   case "$ACTION" in

From a1dd98b8ea63231b992f1f2a0c850de42a066e63 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Thu, 11 Jan 2018 04:18:52 -0800
Subject: [PATCH 06/23] Fix scrolling on big scroll offsets

Summary:
`XCUICoordinate` seems to have a bug that will return half of offset in case coordinate referance point goes off screen. I suspect this has something to do with retina displays.
Instead of using Apple's implementation of `screenPoint` I implemented our own.

Reviewed By: antiarchit

Differential Revision: D6702218

fbshipit-source-id: b01ef061732281cdf8c6707de38a11b6e31b9c28
---
 WebDriverAgent.xcodeproj/project.pbxproj      | 30 ++++++---
 .../Categories/XCUICoordinate+FBFix.h         | 16 +++++
 .../Categories/XCUICoordinate+FBFix.m         | 39 ++++++++++++
 .../Categories/XCUIElement+FBScrolling.m      |  9 +--
 .../UnitTests/Doubles/XCUIElementDouble.h     |  1 +
 .../UnitTests/Doubles/XCUIElementDouble.m     |  5 ++
 .../UnitTests/XCUICoordinateFix.m             | 63 +++++++++++++++++++
 7 files changed, 150 insertions(+), 13 deletions(-)
 create mode 100644 WebDriverAgentLib/Categories/XCUICoordinate+FBFix.h
 create mode 100644 WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m
 create mode 100644 WebDriverAgentTests/UnitTests/XCUICoordinateFix.m

diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj
index c06b52a9db..07de243863 100644
--- a/WebDriverAgent.xcodeproj/project.pbxproj
+++ b/WebDriverAgent.xcodeproj/project.pbxproj
@@ -295,6 +295,9 @@
 		EE9B76AA1CF7A43900275851 /* FBMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9B76A51CF7A43900275851 /* FBMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEBBD48B1D47746D00656A81 /* XCUIElement+FBFind.h in Headers */ = {isa = PBXBuildFile; fileRef = EEBBD4891D47746D00656A81 /* XCUIElement+FBFind.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEBBD48C1D47746D00656A81 /* XCUIElement+FBFind.m in Sources */ = {isa = PBXBuildFile; fileRef = EEBBD48A1D47746D00656A81 /* XCUIElement+FBFind.m */; };
+		EEC9EED620064FAA00BC0D5B /* XCUICoordinate+FBFix.h in Headers */ = {isa = PBXBuildFile; fileRef = EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */; };
+		EEC9EED720064FAA00BC0D5B /* XCUICoordinate+FBFix.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */; };
+		EEC9EED920077D8E00BC0D5B /* XCUICoordinateFix.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */; };
 		EEDFE1211D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = EEDFE11F1D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEDFE1221D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = EEDFE1201D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m */; };
 		EEE16E971D33A25500172525 /* FBConfigurationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EEE16E961D33A25500172525 /* FBConfigurationTests.m */; };
@@ -696,6 +699,9 @@
 		EEC088E71CB56DA400B65968 /* FBExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBExceptionHandler.m; sourceTree = "<group>"; };
 		EEC088EA1CB5706D00B65968 /* FBSpringboardApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBSpringboardApplication.h; path = WebDriverAgentLib/FBSpringboardApplication.h; sourceTree = SOURCE_ROOT; };
 		EEC088EB1CB5706D00B65968 /* FBSpringboardApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBSpringboardApplication.m; path = WebDriverAgentLib/FBSpringboardApplication.m; sourceTree = SOURCE_ROOT; };
+		EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "XCUICoordinate+FBFix.h"; sourceTree = "<group>"; };
+		EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "XCUICoordinate+FBFix.m"; sourceTree = "<group>"; };
+		EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XCUICoordinateFix.m; sourceTree = "<group>"; };
 		EED404361FCF02AB00D08020 /* XCUIScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCUIScreen.h; sourceTree = "<group>"; };
 		EEDBEBBA1CB2681900A790A2 /* WebDriverAgent.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WebDriverAgent.bundle; sourceTree = "<group>"; };
 		EEDFE11F1D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIDevice+FBHealthCheck.h"; sourceTree = "<group>"; };
@@ -887,6 +893,8 @@
 				EE006EAF1EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.m */,
 				AD6C269A1CF2494200F8B5FF /* XCUIApplication+FBHelpers.h */,
 				AD6C269B1CF2494200F8B5FF /* XCUIApplication+FBHelpers.m */,
+				EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */,
+				EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */,
 				EEDFE11F1D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h */,
 				EEDFE1201D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m */,
 				AD6C26961CF2481700F8B5FF /* XCUIDevice+FBHelpers.h */,
@@ -909,10 +917,10 @@
 				EE9AB74C1CAEDF0C008C271F /* XCUIElement+FBTap.m */,
 				AD76723B1D6B7CC000610457 /* XCUIElement+FBTyping.h */,
 				AD76723C1D6B7CC000610457 /* XCUIElement+FBTyping.m */,
-				EEE3763F1D59F81400ED88DD /* XCUIElement+FBUtilities.h */,
-				EEE376401D59F81400ED88DD /* XCUIElement+FBUtilities.m */,
 				71B49EC51ED1A58100D51AD6 /* XCUIElement+FBUID.h */,
 				71B49EC61ED1A58100D51AD6 /* XCUIElement+FBUID.m */,
+				EEE3763F1D59F81400ED88DD /* XCUIElement+FBUtilities.h */,
+				EEE376401D59F81400ED88DD /* XCUIElement+FBUtilities.m */,
 				EEE376471D59FAE900ED88DD /* XCUIElement+FBWebDriverAttributes.h */,
 				EEE376481D59FAE900ED88DD /* XCUIElement+FBWebDriverAttributes.m */,
 			);
@@ -1089,25 +1097,26 @@
 			isa = PBXGroup;
 			children = (
 				ADBC39951D07840300327304 /* Doubles */,
-				EEE16E961D33A25500172525 /* FBConfigurationTests.m */,
 				71A7EAFB1E229302001DA4F2 /* FBClassChainTests.m */,
+				EEE16E961D33A25500172525 /* FBConfigurationTests.m */,
 				ADBC39931D0782CD00327304 /* FBElementCacheTests.m */,
-				719FF5B81DAD21F5008E0099 /* FBElementUtilitiesTests.m */,
 				EE3F8CFF1D08B05F006F02CE /* FBElementTypeTransformerTests.m */,
+				719FF5B81DAD21F5008E0099 /* FBElementUtilitiesTests.m */,
 				EE6A892C1D0B2AF40083E92B /* FBErrorBuilderTests.m */,
+				EE18883C1DA663EB00307AA8 /* FBMathUtilsTests.m */,
 				EE9B76571CF7987300275851 /* FBRouteTests.m */,
 				EE3F8CFD1D08AA17006F02CE /* FBRunLoopSpinnerTests.m */,
 				ADEF63AE1D09DEBE0070A7E3 /* FBRuntimeUtilsTests.m */,
+				714801D01FA9D9FA00DC5997 /* FBSDKVersionTests.m */,
 				EE6A89251D0B19E60083E92B /* FBSessionTests.m */,
+				716E0BD01E917F260087A825 /* FBXMLSafeStringTests.m */,
+				ADEF63AC1D09DCCF0070A7E3 /* FBXPathCreatorTests.m */,
 				712A0C841DA3E459007D02E5 /* FBXPathTests.m */,
+				EE9B76581CF7987300275851 /* Info.plist */,
 				7139145B1DF01A12005896C2 /* NSExpressionFBFormatTests.m */,
 				71A224E71DE326C500844D55 /* NSPredicateFBFormatTests.m */,
-				714801D01FA9D9FA00DC5997 /* FBSDKVersionTests.m */,
-				ADEF63AC1D09DCCF0070A7E3 /* FBXPathCreatorTests.m */,
-				EE18883C1DA663EB00307AA8 /* FBMathUtilsTests.m */,
+				EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */,
 				713914591DF01989005896C2 /* XCUIElementHelpersTests.m */,
-				716E0BD01E917F260087A825 /* FBXMLSafeStringTests.m */,
-				EE9B76581CF7987300275851 /* Info.plist */,
 			);
 			path = UnitTests;
 			sourceTree = "<group>";
@@ -1351,6 +1360,7 @@
 				EE35AD721E3B77D600A02D78 /* XCUIElementHitPointCoordinate.h in Headers */,
 				EE35AD3F1E3B77D600A02D78 /* XCTDarwinNotificationExpectation.h in Headers */,
 				EE35AD5F1E3B77D600A02D78 /* XCTRunnerAutomationSession.h in Headers */,
+				EEC9EED620064FAA00BC0D5B /* XCUICoordinate+FBFix.h in Headers */,
 				EE35AD371E3B77D600A02D78 /* XCSourceCodeTreeNodeEnumerator.h in Headers */,
 				EE158AB01CBD456F00A3E3F0 /* XCUIElement+FBIsVisible.h in Headers */,
 				EE158AF11CBD456F00A3E3F0 /* FBXPathCreator.h in Headers */,
@@ -1767,6 +1777,7 @@
 				716E0BCF1E917E810087A825 /* NSString+FBXMLSafeString.m in Sources */,
 				EE158ACD1CBD456F00A3E3F0 /* FBUnknownCommands.m in Sources */,
 				EE158AC51CBD456F00A3E3F0 /* FBOrientationCommands.m in Sources */,
+				EEC9EED720064FAA00BC0D5B /* XCUICoordinate+FBFix.m in Sources */,
 				EE158AEB1CBD456F00A3E3F0 /* FBRuntimeUtils.m in Sources */,
 				EEE376461D59F81400ED88DD /* XCUIElement+FBUtilities.m in Sources */,
 				EE9B76A91CF7A43900275851 /* FBLogger.m in Sources */,
@@ -1849,6 +1860,7 @@
 				ADBC39981D07842800327304 /* XCUIElementDouble.m in Sources */,
 				7139145A1DF01989005896C2 /* XCUIElementHelpersTests.m in Sources */,
 				EE6A89261D0B19E60083E92B /* FBSessionTests.m in Sources */,
+				EEC9EED920077D8E00BC0D5B /* XCUICoordinateFix.m in Sources */,
 				71A7EAFC1E229302001DA4F2 /* FBClassChainTests.m in Sources */,
 				EE18883D1DA663EB00307AA8 /* FBMathUtilsTests.m in Sources */,
 			);
diff --git a/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.h b/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.h
new file mode 100644
index 0000000000..55742a95c9
--- /dev/null
+++ b/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.h
@@ -0,0 +1,16 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+@interface XCUICoordinate (FBFix)
+
+- (CGPoint)fb_screenPoint;
+
+@end
diff --git a/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m b/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m
new file mode 100644
index 0000000000..6b6aa62c35
--- /dev/null
+++ b/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m
@@ -0,0 +1,39 @@
+/**
+ * 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 "XCUICoordinate+FBFix.h"
+
+#import "XCUICoordinate.h"
+#import "XCUIElement+FBUtilities.h"
+#import "XCElementSnapshot+FBHitPoint.h"
+
+@implementation XCUICoordinate (FBFix)
+
+- (CGPoint)fb_screenPoint
+{
+  CGPoint referencePoint = CGPointMake(0, 0);
+  if (self.element) {
+    CGRect frame = self.element.frame;
+    referencePoint = CGPointMake(
+      CGRectGetMinX(frame) + CGRectGetWidth(frame) * self.normalizedOffset.dx,
+      CGRectGetMinY(frame) + CGRectGetHeight(frame) * self.normalizedOffset.dy);
+  }
+  else if (self.coordinate) {
+    referencePoint = self.coordinate.fb_screenPoint;
+  }
+  CGPoint screenPoint = CGPointMake(
+    referencePoint.x + self.pointsOffset.dx,
+    referencePoint.y + self.pointsOffset.dy);
+  CGRect rect = self.referencedElement.frame;
+  return CGPointMake(
+    MIN(CGRectGetMaxX(rect), screenPoint.x),
+    MIN(CGRectGetMaxY(rect), screenPoint.y));
+}
+
+@end
diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m b/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m
index c87e44716a..4123c4e175 100644
--- a/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m
@@ -24,6 +24,7 @@
 #import "XCTestDriver.h"
 #import "XCUIApplication.h"
 #import "XCUICoordinate.h"
+#import "XCUICoordinate+FBFix.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBUtilities.h"
@@ -238,7 +239,7 @@ - (BOOL)fb_scrollByVector:(CGVector)vector inApplication:(XCUIApplication *)appl
                                                );
   scrollBoundingVector.dx = (CGFloat)floor(copysign(scrollBoundingVector.dx, vector.dx));
   scrollBoundingVector.dy = (CGFloat)floor(copysign(scrollBoundingVector.dy, vector.dy));
-	
+
   NSUInteger scrollLimit = 100;
   BOOL shouldFinishScrolling = NO;
   while (!shouldFinishScrolling) {
@@ -269,15 +270,15 @@ - (BOOL)fb_scrollAncestorScrollViewByVectorWithinScrollViewFrame:(CGVector)vecto
   XCUICoordinate *startCoordinate = [[XCUICoordinate alloc] initWithCoordinate:appCoordinate pointsOffset:hitpointOffset];
   XCUICoordinate *endCoordinate = [[XCUICoordinate alloc] initWithCoordinate:startCoordinate pointsOffset:vector];
 
-  if (FBPointFuzzyEqualToPoint(startCoordinate.screenPoint, endCoordinate.screenPoint, FBFuzzyPointThreshold)) {
+  if (FBPointFuzzyEqualToPoint(startCoordinate.fb_screenPoint, endCoordinate.fb_screenPoint, FBFuzzyPointThreshold)) {
     return YES;
   }
 
   CGFloat offset = 0.3f; // Waiting before scrolling helps to make it more stable
   double scrollingTime = MAX(fabs(vector.dx), fabs(vector.dy))/FBScrollVelocity;
-  XCPointerEventPath *touchPath = [[XCPointerEventPath alloc] initForTouchAtPoint:startCoordinate.screenPoint offset:offset];
+  XCPointerEventPath *touchPath = [[XCPointerEventPath alloc] initForTouchAtPoint:startCoordinate.fb_screenPoint offset:offset];
   offset += MAX(scrollingTime, FBMinimumTouchEventDelay); // Setting Minimum scrolling time to avoid testmanager complaining about timing
-  [touchPath moveToPoint:endCoordinate.screenPoint atOffset:offset];
+  [touchPath moveToPoint:endCoordinate.fb_screenPoint atOffset:offset];
   offset += FBMinimumTouchEventDelay;
   [touchPath liftUpAtOffset:offset];
 
diff --git a/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h b/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h
index 89e39d2536..e1a0dfa1a8 100644
--- a/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h
+++ b/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h
@@ -15,6 +15,7 @@
 
 @interface XCUIElementDouble : NSObject<FBElement>
 @property (nonatomic, strong, nonnull) XCUIApplication *application;
+@property (nonatomic, readwrite, assign) CGRect frame;
 @property (nonatomic, assign) BOOL fb_isObstructedByAlert;
 @property (nonatomic, readwrite, copy, nonnull) NSDictionary *wdRect;
 @property (nonatomic, readwrite, assign) CGRect wdFrame;
diff --git a/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m b/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m
index 99a8cb237b..1cd3847a53 100644
--- a/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m
+++ b/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m
@@ -50,4 +50,9 @@ - (void)resolve
   self.didResolve = YES;
 }
 
+- (id)lastSnapshot
+{
+  return self;
+}
+
 @end
diff --git a/WebDriverAgentTests/UnitTests/XCUICoordinateFix.m b/WebDriverAgentTests/UnitTests/XCUICoordinateFix.m
new file mode 100644
index 0000000000..562d1105bc
--- /dev/null
+++ b/WebDriverAgentTests/UnitTests/XCUICoordinateFix.m
@@ -0,0 +1,63 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+#import "FBMathUtils.h"
+#import "XCUICoordinate.h"
+#import "XCUICoordinate+FBFix.h"
+#import "XCUIElementDouble.h"
+
+@interface XCUICoordinateFix : XCTestCase
+@property (nonatomic, strong, nullable) XCUIElement *mockElement;
+@property (nonatomic, strong, nullable) XCUICoordinate *defaultCoordinate;
+@end
+
+@implementation XCUICoordinateFix
+
+- (void)setUp
+{
+  [super setUp];
+  XCUIElementDouble *element = [XCUIElementDouble new];
+  element.frame = CGRectMake(1, 2, 9, 10);
+  self.mockElement = (XCUIElement *)element;
+  self.defaultCoordinate = [[XCUICoordinate alloc] initWithElement:self.mockElement normalizedOffset:CGVectorMake(0.0, 0.0)];
+}
+
+- (void)testCoordinateWithElement
+{
+  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithElement:self.mockElement normalizedOffset:CGVectorMake(0.0, 0.0)];
+  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(1, 2), 0.1));
+}
+
+- (void)testCoordinateWithElementWithOffset
+{
+  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithElement:self.mockElement normalizedOffset:CGVectorMake(0.5, 0.5)];
+  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(5.5, 7), 0.1));
+}
+
+- (void)testCoordinateWithCoordinate
+{
+  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithCoordinate:self.defaultCoordinate pointsOffset:CGVectorMake(0, 0)];
+  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(1, 2), 0.1));
+}
+
+- (void)testCoordinateWithCoordinateWithOffset
+{
+  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithCoordinate:self.defaultCoordinate pointsOffset:CGVectorMake(1, 2)];
+  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(2, 4), 0.1));
+}
+
+- (void)testCoordinateWithCoordinateWithOffsetOffBounds
+{
+  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithCoordinate:self.defaultCoordinate pointsOffset:CGVectorMake(200, 200)];
+  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(10, 12), 0.1));
+}
+
+@end

From 5496674843400b05f919190651987098b6135587 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Thu, 11 Jan 2018 09:19:22 -0800
Subject: [PATCH 07/23] Run testInvisibleDescendantWithXPathQuery test on
 scroll page

Summary:
With all visibility changes tested pageindicator is no longer considered invisible. For the time being this is ok with us.
This diff uses different invisible elements to run same test of search for invisible elements

Reviewed By: antiarchit

Differential Revision: D6702252

fbshipit-source-id: a2bd5198d14f05cb1b33afe76a6b5bda7e34a847
---
 .../IntegrationTests/XCUIElementFBFindTests.m | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m b/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m
index 115049939b..88fae1e5a3 100644
--- a/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m
+++ b/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m
@@ -305,8 +305,6 @@ - (void)testClassChainWithInvalidPredicate
 
 @interface XCUIElementFBFindTests_AttributesPage : FBIntegrationTestCase
 @end
-
-
 @implementation XCUIElementFBFindTests_AttributesPage
 
 - (void)setUp
@@ -319,14 +317,6 @@ - (void)setUp
   });
 }
 
-- (void)testInvisibleDescendantWithXPathQuery
-{
-  NSArray<XCUIElement *> *matchingSnapshots = [self.testedApplication fb_descendantsMatchingXPathQuery:@"//XCUIElementTypePageIndicator[@visible='false']" shouldReturnAfterFirstMatch:NO];
-  XCTAssertEqual(matchingSnapshots.count, 1);
-  XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypePageIndicator);
-  XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
-}
-
 - (void)testNestedQueryWithClassChain
 {
   FBAssertWaitTillBecomesTrue(self.testedApplication.buttons[@"Button"].fb_isVisible);
@@ -337,3 +327,27 @@ - (void)testNestedQueryWithClassChain
 }
 
 @end
+
+@interface XCUIElementFBFindTests_ScrollPage : FBIntegrationTestCase
+@end
+@implementation XCUIElementFBFindTests_ScrollPage
+
+- (void)setUp
+{
+  [super setUp];
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    [self launchApplication];
+    [self goToScrollPageWithCells:YES];
+  });
+}
+
+- (void)testInvisibleDescendantWithXPathQuery
+{
+  NSArray<XCUIElement *> *matchingSnapshots = [self.testedApplication fb_descendantsMatchingXPathQuery:@"//XCUIElementTypeStaticText[@visible='false']" shouldReturnAfterFirstMatch:NO];
+  XCTAssertGreaterThan(matchingSnapshots.count, 1);
+  XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypeStaticText);
+  XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
+}
+
+@end

From 52512a7fb39a697fc727d372c8765a43c74f6d37 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Tue, 16 Jan 2018 06:10:30 -0800
Subject: [PATCH 08/23] Do not run testSpringBoardIcons on iPads

Summary: This test was not intended to run on iPad, so we should turn it off so that we can make Travis green again :).

Reviewed By: antiarchit

Differential Revision: D6726707

fbshipit-source-id: db92f23b2dc755e7c1464069c04b1838717b8ff4
---
 .../IntegrationTests/FBElementVisibilityTests.m                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m b/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
index a92bf219cd..6accc3446d 100644
--- a/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
@@ -22,6 +22,9 @@ @implementation FBElementVisibilityTests
 
 - (void)testSpringBoardIcons
 {
+  if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
+    return;
+  }
   [self launchApplication];
   [self goToSpringBoardFirstPage];
 

From 183f679ac0908c266ceb8286c86186eb8d2be995 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Fri, 2 Feb 2018 08:02:01 -0800
Subject: [PATCH 09/23] Fix resolving XCUIApplication snapshots

Summary:
With new xcode it looks like, calling `query`, `resolve` on XCUIApplication will in some sense break it. Not sure exactly what goes wrong, but final result is that it's missing some children and description of that object is empty.
Instead we can use new API for fetching snapshots for debugging.

Reviewed By: lawrencelomax

Differential Revision: D6723102

fbshipit-source-id: a33d9caf03eef4450f3879996493493c2cb257b4
---
 PrivateHeaders/XCTest/XCUIApplication.h                | 2 +-
 PrivateHeaders/XCTest/XCUIElementQuery.h               | 2 +-
 WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m | 4 ++--
 WebDriverAgentLib/FBApplication.m                      | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/PrivateHeaders/XCTest/XCUIApplication.h b/PrivateHeaders/XCTest/XCUIApplication.h
index be785fbcd8..8234f392c2 100644
--- a/PrivateHeaders/XCTest/XCUIApplication.h
+++ b/PrivateHeaders/XCTest/XCUIApplication.h
@@ -53,7 +53,7 @@
 - (id)application;
 - (id)description;
 - (id)lastSnapshot;
-- (id)query;
+- (XCUIElementQuery *)query;
 - (void)clearQuery;
 - (void)resolveHandleUIInterruption:(BOOL)arg1;
 - (id)initPrivateWithPath:(id)arg1 bundleID:(id)arg2;
diff --git a/PrivateHeaders/XCTest/XCUIElementQuery.h b/PrivateHeaders/XCTest/XCUIElementQuery.h
index c16b704cad..7c576a72cb 100644
--- a/PrivateHeaders/XCTest/XCUIElementQuery.h
+++ b/PrivateHeaders/XCTest/XCUIElementQuery.h
@@ -35,7 +35,7 @@
 - (id)matchingSnapshotsWithError:(id *)arg1;
 - (id)matchingSnapshotsHandleUIInterruption:(BOOL)arg1 withError:(id *)arg2;
 - (id)_elementMatchingAccessibilityElementOfSnapshot:(id)arg1;
-
+- (XCElementSnapshot *)elementSnapshotForDebugDescription;
 - (id)_containingPredicate:(id)arg1 queryDescription:(id)arg2;
 - (id)_predicateWithType:(unsigned long long)arg1 identifier:(id)arg2;
 - (id)_queryWithPredicate:(id)arg1;
diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m b/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m
index c0534269c2..868dfb6870 100644
--- a/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m
@@ -20,6 +20,7 @@
 #import "FBXCodeCompatibility.h"
 #import "XCAXClient_iOS.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
+#import "XCUIElementQuery.h"
 #import "XCUIScreen.h"
 
 @implementation XCUIElement (FBUtilities)
@@ -65,9 +66,8 @@ - (BOOL)fb_obstructsElement:(XCUIElement *)element
 
 - (XCElementSnapshot *)fb_lastSnapshot
 {
-  [self query];
   [self resolve];
-  return self.lastSnapshot;
+  return [[self query] elementSnapshotForDebugDescription];
 }
 
 - (NSArray<XCUIElement *> *)fb_filterDescendantsWithSnapshots:(NSArray<XCElementSnapshot *> *)snapshots
diff --git a/WebDriverAgentLib/FBApplication.m b/WebDriverAgentLib/FBApplication.m
index 186f8e1d16..3a71d8a41b 100644
--- a/WebDriverAgentLib/FBApplication.m
+++ b/WebDriverAgentLib/FBApplication.m
@@ -41,8 +41,6 @@ + (instancetype)fb_activeApplication
   }
   FBApplication *application = [FBApplication fb_applicationWithPID:activeApplicationElement.processIdentifier];
   NSAssert(nil != application, @"Active application instance is not expected to be equal to nil", nil);
-  [application query];
-  [application resolve];
   return application;
 }
 

From 1199aa4b3de8c07ebfd7fd45e5bbc40185ae713f Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Mon, 5 Feb 2018 06:36:39 -0800
Subject: [PATCH 10/23] Use visibleFrame to calculate scrolling vector

Summary:
Using views frame for calculating scroling vector might be buggy when application is doing tricky stuff with scolling views eg. nesting scrollview within scrollview.
In that case frame of the second scrollview will be huge and make scrolling imposible as we will try to use points of the screen. Instead we should visible frame.

Reviewed By: antiarchit

Differential Revision: D6819626

fbshipit-source-id: 27062f593485b4ec55ae8bd1a9c9a32a89630b92
---
 .../Categories/XCUIElement+FBScrolling.m        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m b/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m
index 4123c4e175..55623955d4 100644
--- a/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m
@@ -204,6 +204,11 @@ - (BOOL)fb_isEquivalentElementSnapshotVisible:(XCElementSnapshot *)snapshot
 
 @implementation XCElementSnapshot (FBScrolling)
 
+- (CGRect)scrollingFrame
+{
+  return self.visibleFrame;
+}
+
 - (void)fb_scrollUpByNormalizedDistance:(CGFloat)distance inApplication:(XCUIApplication *)application
 {
   [self fb_scrollByNormalizedVector:CGVectorMake(0.0, distance) inApplication:application];
@@ -226,16 +231,16 @@ - (void)fb_scrollRightByNormalizedDistance:(CGFloat)distance inApplication:(XCUI
 
 - (BOOL)fb_scrollByNormalizedVector:(CGVector)normalizedScrollVector inApplication:(XCUIApplication *)application
 {
-  CGVector scrollVector = CGVectorMake(CGRectGetWidth(self.frame) * normalizedScrollVector.dx,
-                                       CGRectGetHeight(self.frame) * normalizedScrollVector.dy
+  CGVector scrollVector = CGVectorMake(CGRectGetWidth(self.scrollingFrame) * normalizedScrollVector.dx,
+                                       CGRectGetHeight(self.scrollingFrame) * normalizedScrollVector.dy
                                        );
   return [self fb_scrollByVector:scrollVector inApplication:application error:nil];
 }
 
 - (BOOL)fb_scrollByVector:(CGVector)vector inApplication:(XCUIApplication *)application error:(NSError **)error
 {
-  CGVector scrollBoundingVector = CGVectorMake(CGRectGetWidth(self.frame) * FBScrollTouchProportion - FBScrollBoundingVelocityPadding,
-                                               CGRectGetHeight(self.frame)* FBScrollTouchProportion - FBScrollBoundingVelocityPadding
+  CGVector scrollBoundingVector = CGVectorMake(CGRectGetWidth(self.scrollingFrame) * FBScrollTouchProportion - FBScrollBoundingVelocityPadding,
+                                               CGRectGetHeight(self.scrollingFrame)* FBScrollTouchProportion - FBScrollBoundingVelocityPadding
                                                );
   scrollBoundingVector.dx = (CGFloat)floor(copysign(scrollBoundingVector.dx, vector.dx));
   scrollBoundingVector.dy = (CGFloat)floor(copysign(scrollBoundingVector.dy, vector.dy));
@@ -257,8 +262,8 @@ - (BOOL)fb_scrollByVector:(CGVector)vector inApplication:(XCUIApplication *)appl
 
 - (CGVector)fb_hitPointOffsetForScrollingVector:(CGVector)scrollingVector
 {
-  CGFloat x = CGRectGetMinX(self.frame) + CGRectGetWidth(self.frame) * (scrollingVector.dx < 0.0f ? FBScrollTouchProportion : (1 - FBScrollTouchProportion));
-  CGFloat y = CGRectGetMinY(self.frame) + CGRectGetHeight(self.frame) * (scrollingVector.dy < 0.0f ? FBScrollTouchProportion : (1 - FBScrollTouchProportion));
+  CGFloat x = CGRectGetMinX(self.scrollingFrame) + CGRectGetWidth(self.scrollingFrame) * (scrollingVector.dx < 0.0f ? FBScrollTouchProportion : (1 - FBScrollTouchProportion));
+  CGFloat y = CGRectGetMinY(self.scrollingFrame) + CGRectGetHeight(self.scrollingFrame) * (scrollingVector.dy < 0.0f ? FBScrollTouchProportion : (1 - FBScrollTouchProportion));
   return CGVectorMake((CGFloat)floor(x), (CGFloat)floor(y));
 }
 

From 20246d3e3f1fd26a9579664a696206139d8615cd Mon Sep 17 00:00:00 2001
From: Jon Gabilondo <jon.gabilondo@hp.com>
Date: Mon, 26 Feb 2018 08:25:22 -0800
Subject: [PATCH 11/23] fb_isVisible using interfaceOrientation instead of
 Device orientation.

Summary:
[XCUIDevice sharedDevice].orientation may get values like FaceUp, which cause wrong calculation of the app frame size, in landscape.

With devices in Lab, standing portrait, this problem is less common. Working on development with devices on the table it happens more often causing a great deal of confusion.

From my tests, using app interfaceOrientation gives always the reality of the App.
Closes https://github.com/facebook/WebDriverAgent/pull/875

Reviewed By: marekcirkos

Differential Revision: D7067153

Pulled By: antiarchit

fbshipit-source-id: c6aa8f8823d0f43e5072a190c34df931d0d6b8b8
---
 WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m b/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m
index dc0e5d4c72..466df540a7 100644
--- a/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m
@@ -40,7 +40,7 @@ - (BOOL)fb_isVisible
     return [(NSNumber *)[self fb_attributeValue:FB_XCAXAIsVisibleAttribute] boolValue];
   }
   CGRect appFrame = [self fb_rootElement].frame;
-  CGSize screenSize = FBAdjustDimensionsForApplication(appFrame.size, (UIInterfaceOrientation)[XCUIDevice sharedDevice].orientation);
+  CGSize screenSize = FBAdjustDimensionsForApplication(appFrame.size, self.application.interfaceOrientation);
   CGRect screenFrame = CGRectMake(0, 0, screenSize.width, screenSize.height);
   if (!CGRectIntersectsRect(frame, screenFrame)) {
     return NO;

From f81e120cdf6f74185f0f653c23171e5c63ee5d74 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <nick+1@wire.com>
Date: Thu, 15 Mar 2018 09:56:55 -0700
Subject: [PATCH 12/23] Fix testIconsFromSearchDashboard integration test

Summary:
It might be there is more than one `IntegrationApp` icon on the dashboard while integration tests are running on Travis. Addresses https://travis-ci.org/facebook/WebDriverAgent/jobs/349725814
Closes https://github.com/facebook/WebDriverAgent/pull/883

Differential Revision: D7289614

Pulled By: marekcirkos

fbshipit-source-id: e5060888f2a752c039fcf815984e24579a3cef06
---
 .../IntegrationTests/FBElementVisibilityTests.m              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m b/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
index 6accc3446d..b81e7ae594 100644
--- a/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m
@@ -13,6 +13,7 @@
 #import "FBIntegrationTestCase.h"
 #import "FBSpringboardApplication.h"
 #import "FBTestMacros.h"
+#import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBIsVisible.h"
 
 @interface FBElementVisibilityTests : FBIntegrationTestCase
@@ -51,7 +52,9 @@ - (void)testIconsFromSearchDashboard
   [self launchApplication];
   [self goToSpringBoardDashboard];
   XCTAssertFalse(self.springboard.icons[@"Reminders"].fb_isVisible);
-  XCTAssertFalse(self.springboard.icons[@"IntegrationApp"].fb_isVisible);
+  XCTAssertFalse([[[self.springboard descendantsMatchingType:XCUIElementTypeIcon]
+                   matchingIdentifier:@"IntegrationApp"]
+                  fb_firstMatch].fb_isVisible);
 }
 
 - (void)testTableViewCells

From 952e6bfc565f7c04d7fcafde5e6fb01dcd89c6db Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Mon, 16 Apr 2018 10:40:41 -0700
Subject: [PATCH 13/23] Allow to override typing frequency for single typing
 request

Reviewed By: antiarchit

Differential Revision: D7615943

fbshipit-source-id: 9cb82dce23c02970d0c29613c7de4ebca0838361
---
 .../Categories/XCUIElement+FBTyping.h            | 11 +++++++++++
 .../Categories/XCUIElement+FBTyping.m            | 10 ++++++++--
 WebDriverAgentLib/Commands/FBElementCommands.m   |  7 +++++--
 WebDriverAgentLib/Utilities/FBKeyboard.h         | 16 +++++++++++++++-
 WebDriverAgentLib/Utilities/FBKeyboard.m         |  8 +++++++-
 5 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBTyping.h b/WebDriverAgentLib/Categories/XCUIElement+FBTyping.h
index 627280cb9d..cf1e15e32e 100644
--- a/WebDriverAgentLib/Categories/XCUIElement+FBTyping.h
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBTyping.h
@@ -23,6 +23,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)fb_typeText:(NSString *)text error:(NSError **)error;
 
+/**
+ Types a text into element.
+ It will try to activate keyboard on element, if element has no keyboard focus.
+
+ @param text text that should be typed
+ @param frequency Frequency of typing (letters per sec)
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES if the operation succeeds, otherwise NO.
+ */
+- (BOOL)fb_typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSError **)error;
+
 /**
  Clears text on element.
  It will try to activate keyboard on element, if element has no keyboard focus.
diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m b/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m
index 53f02dd308..2c0a801dd3 100644
--- a/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m
@@ -9,6 +9,7 @@
 
 #import "XCUIElement+FBTyping.h"
 
+#import "FBConfiguration.h"
 #import "FBErrorBuilder.h"
 #import "FBKeyboard.h"
 #import "NSString+FBVisualLength.h"
@@ -17,11 +18,16 @@
 @implementation XCUIElement (FBTyping)
 
 - (BOOL)fb_typeText:(NSString *)text error:(NSError **)error
+{
+  return [self fb_typeText:text frequency:[FBConfiguration maxTypingFrequency] error:error];
+}
+
+- (BOOL)fb_typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSError **)error
 {
   if (!self.hasKeyboardFocus && ![self fb_tapWithError:error]) {
     return NO;
   }
-  if (![FBKeyboard typeText:text error:error]) {
+  if (![FBKeyboard typeText:text frequency:frequency error:error]) {
     return NO;
   }
   return YES;
@@ -38,7 +44,7 @@ - (BOOL)fb_clearTextWithError:(NSError **)error
     for (NSUInteger i = 0 ; i < preClearTextLength ; i++) {
       [textToType appendString:backspaceDeleteSequence];
     }
-    if (![self fb_typeText:textToType error:error]) {
+    if (![self fb_typeText:textToType frequency:[FBConfiguration maxTypingFrequency] error:error]) {
       return NO;
     }
   }
diff --git a/WebDriverAgentLib/Commands/FBElementCommands.m b/WebDriverAgentLib/Commands/FBElementCommands.m
index d69b6a7223..f1c1ec2149 100644
--- a/WebDriverAgentLib/Commands/FBElementCommands.m
+++ b/WebDriverAgentLib/Commands/FBElementCommands.m
@@ -10,6 +10,7 @@
 #import "FBElementCommands.h"
 
 #import "FBApplication.h"
+#import "FBConfiguration.h"
 #import "FBKeyboard.h"
 #import "FBPredicate.h"
 #import "FBRoute.h"
@@ -167,8 +168,9 @@ + (NSArray *)routes
     [element adjustToNormalizedSliderPosition:sliderValue];
     return FBResponseWithOK();
   }
+  NSUInteger frequency = (NSUInteger)[request.arguments[@"frequency"] longLongValue] ?: [FBConfiguration maxTypingFrequency];
   NSError *error = nil;
-  if (![element fb_typeText:textToType error:&error]) {
+  if (![element fb_typeText:textToType frequency:frequency error:&error]) {
     return FBResponseWithError(error);
   }
   return FBResponseWithElementUUID(elementUUID);
@@ -365,8 +367,9 @@ + (NSArray *)routes
 + (id<FBResponsePayload>)handleKeys:(FBRouteRequest *)request
 {
   NSString *textToType = [request.arguments[@"value"] componentsJoinedByString:@""];
+  NSUInteger frequency = [request.arguments[@"frequency"] unsignedIntegerValue] ?: [FBConfiguration maxTypingFrequency];
   NSError *error;
-  if (![FBKeyboard typeText:textToType error:&error]) {
+  if (![FBKeyboard typeText:textToType frequency:frequency error:&error]) {
     return FBResponseWithError(error);
   }
   return FBResponseWithOK();
diff --git a/WebDriverAgentLib/Utilities/FBKeyboard.h b/WebDriverAgentLib/Utilities/FBKeyboard.h
index f75fad9bd2..7dc01c7457 100644
--- a/WebDriverAgentLib/Utilities/FBKeyboard.h
+++ b/WebDriverAgentLib/Utilities/FBKeyboard.h
@@ -23,9 +23,23 @@ NS_ASSUME_NONNULL_BEGIN
  @param text that should be typed
  @param error If there is an error, upon return contains an NSError object that describes the problem.
  @return YES if the operation succeeds, otherwise NO.
-*/
+ */
 + (BOOL)typeText:(NSString *)text error:(NSError **)error;
 
+/**
+ Types a string into active element. There must be element with keyboard focus; otherwise an
+ error is raised.
+
+ This API discards any modifiers set in the current context by +performWithKeyModifiers:block: so that
+ it strictly interprets the provided text. To input keys with modifier flags, use  -typeKey:modifierFlags:.
+
+ @param text that should be typed
+ @param frequency Frequency of typing (letters per sec)
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES if the operation succeeds, otherwise NO.
+*/
++ (BOOL)typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/WebDriverAgentLib/Utilities/FBKeyboard.m b/WebDriverAgentLib/Utilities/FBKeyboard.m
index d0bd5f6c0f..b38ec2cd88 100644
--- a/WebDriverAgentLib/Utilities/FBKeyboard.m
+++ b/WebDriverAgentLib/Utilities/FBKeyboard.m
@@ -11,6 +11,7 @@
 
 
 #import "FBApplication.h"
+#import "FBConfiguration.h"
 #import "FBXCTestDaemonsProxy.h"
 #import "FBErrorBuilder.h"
 #import "FBRunLoopSpinner.h"
@@ -26,6 +27,11 @@
 @implementation FBKeyboard
 
 + (BOOL)typeText:(NSString *)text error:(NSError **)error
+{
+  return [self typeText:text frequency:[FBConfiguration maxTypingFrequency] error:error];
+}
+
++ (BOOL)typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSError **)error
 {
   if (![FBKeyboard waitUntilVisibleWithError:error]) {
     return NO;
@@ -35,7 +41,7 @@ + (BOOL)typeText:(NSString *)text error:(NSError **)error
   [FBRunLoopSpinner spinUntilCompletion:^(void(^completion)(void)){
     [[FBXCTestDaemonsProxy testRunnerProxy]
      _XCT_sendString:text
-     maximumFrequency:[FBConfiguration maxTypingFrequency]
+     maximumFrequency:frequency
      completion:^(NSError *typingError){
        didSucceed = (typingError == nil);
        innerError = typingError;

From 60b254b3b13ef906c7b63380394f0d0ff122a7d1 Mon Sep 17 00:00:00 2001
From: Anton Kushpil <akus@ciklum.com>
Date: Thu, 10 May 2018 02:19:35 -0700
Subject: [PATCH 14/23] Include RoutingHTTPServer in copy to fix ISSUE #902

Summary:
Include RoutingHTTPServer in copy to fix ISSUE #902
Closes https://github.com/facebook/WebDriverAgent/pull/915

Differential Revision: D7947944

Pulled By: marekcirkos

fbshipit-source-id: ca60238fc3f715f753f084493aec5afa4524b21b
---
 WebDriverAgent.xcodeproj/project.pbxproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj
index 07de243863..8642ab3a66 100644
--- a/WebDriverAgent.xcodeproj/project.pbxproj
+++ b/WebDriverAgent.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		18033EFF208761FC00FED81D /* RoutingHTTPServer.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = AD42DD2B1CF1238500806E5D /* RoutingHTTPServer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		711084441DA3AA7500F913D6 /* FBXPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 711084421DA3AA7500F913D6 /* FBXPath.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		711084451DA3AA7500F913D6 /* FBXPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 711084431DA3AA7500F913D6 /* FBXPath.m */; };
 		7119E1EC1E891F8600D0B125 /* FBPickerWheelSelectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7119E1EB1E891F8600D0B125 /* FBPickerWheelSelectTests.m */; };
@@ -382,6 +383,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				18033EFF208761FC00FED81D /* RoutingHTTPServer.framework in Copy frameworks */,
 				AD35D06C1CF1C35500870A75 /* WebDriverAgentLib.framework in Copy frameworks */,
 			);
 			name = "Copy frameworks";

From 52eee02f8257cfc90cc0aa9640f13478a14e32d7 Mon Sep 17 00:00:00 2001
From: Liu Junqi <devileo@devileo-macbook-pro.local>
Date: Fri, 25 May 2018 12:14:28 -0700
Subject: [PATCH 15/23] Fix the incorrect tap coordinate in landscape mode.

Summary:
If SDK >= 11, the tap coordinate based on application is not correct when
  the application orientation is landscape and
  tapX > application portrait width or tapY > application portrait height.
  Pass the window element to the method [FBElementCommands gestureCoordinateWithCoordinate:element:] will resolve the problem.
  More details about the bug, please see the following issues: #705, #798, #856.
  Notice: On iOS 10, if the application is not launched by wda, no elements will be found. See issue #732.
Closes https://github.com/facebook/WebDriverAgent/pull/878

Differential Revision: D7947931

Pulled By: marekcirkos

fbshipit-source-id: 4f8ef1484761b79c69f67df40293eea70bc08984
---
 .../Commands/FBElementCommands.m              | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/WebDriverAgentLib/Commands/FBElementCommands.m b/WebDriverAgentLib/Commands/FBElementCommands.m
index f1c1ec2149..e73e7bc948 100644
--- a/WebDriverAgentLib/Commands/FBElementCommands.m
+++ b/WebDriverAgentLib/Commands/FBElementCommands.m
@@ -36,6 +36,7 @@
 #import "FBElementTypeTransformer.h"
 #import "XCUIElement.h"
 #import "XCUIElementQuery.h"
+#import "FBXCodeCompatibility.h"
 
 @interface FBElementCommands ()
 @end
@@ -463,8 +464,39 @@ + (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate applicat
   if (shouldApplyOrientationWorkaround) {
     point = FBInvertPointForApplication(coordinate, application.frame.size, application.interfaceOrientation);
   }
-  XCUICoordinate *appCoordinate = [[XCUICoordinate alloc] initWithElement:application normalizedOffset:CGVectorMake(0, 0)];
-  return [[XCUICoordinate alloc] initWithCoordinate:appCoordinate pointsOffset:CGVectorMake(point.x, point.y)];
+  
+  /**
+   If SDK >= 11, the tap coordinate based on application is not correct when
+   the application orientation is landscape and
+   tapX > application portrait width or tapY > application portrait height.
+   Pass the window element to the method [FBElementCommands gestureCoordinateWithCoordinate:element:]
+   will resolve the problem.
+   More details about the bug, please see the following issues:
+   #705: https://github.com/facebook/WebDriverAgent/issues/705
+   #798: https://github.com/facebook/WebDriverAgent/issues/798
+   #856: https://github.com/facebook/WebDriverAgent/issues/856
+   Notice: On iOS 10, if the application is not launched by wda, no elements will be found.
+   See issue #732: https://github.com/facebook/WebDriverAgent/issues/732
+   */
+  XCUIElement *element = application;
+  if (isSDKVersionGreaterThanOrEqualTo(@"11.0")) {
+    XCUIElement *window = application.windows.fb_firstMatch;
+    if (window) element = window;
+  }
+  return [self gestureCoordinateWithCoordinate:point element:element];
+}
+
+/**
+ Returns gesture coordinate based on the specified element.
+ 
+ @param coordinate absolute coordinates based on the element
+ @param element the element in the current application under test
+ @return translated gesture coordinates ready to be passed to XCUICoordinate methods
+ */
++ (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate element:(XCUIElement *)element
+{
+  XCUICoordinate *appCoordinate = [[XCUICoordinate alloc] initWithElement:element normalizedOffset:CGVectorMake(0, 0)];
+  return [[XCUICoordinate alloc] initWithCoordinate:appCoordinate pointsOffset:CGVectorMake(coordinate.x, coordinate.y)];
 }
 
 @end

From eb9a584c9478a18bd29798419cb5e206474fa441 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Thu, 31 May 2018 06:06:46 -0700
Subject: [PATCH 16/23] Update flow-bin for WebDriverAgent's Inspector

Differential Revision: D8220228

fbshipit-source-id: cf08317ab2e50282373576fedb7c2b26b47969ad
---
 Inspector/.flowconfig  | 2 +-
 Inspector/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Inspector/.flowconfig b/Inspector/.flowconfig
index 257da1510e..e791cdafe9 100644
--- a/Inspector/.flowconfig
+++ b/Inspector/.flowconfig
@@ -11,4 +11,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
 esproposal.class_static_fields=enable
 
 [version]
-^0.38.0
+^0.73.0
diff --git a/Inspector/package.json b/Inspector/package.json
index f7108b77ee..3437e6fe3a 100644
--- a/Inspector/package.json
+++ b/Inspector/package.json
@@ -25,7 +25,7 @@
     "eslint-plugin-babel": "^4.0.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^6.9.0",
-    "flow-bin": "^0.38.0",
+    "flow-bin": "^0.73.0",
     "webpack-dev-server": "^1.10.1"
   },
   "scripts": {

From 762760d01623505bdab09ba008d94f0c66b1a364 Mon Sep 17 00:00:00 2001
From: Marek Cirkos <marekc@fb.com>
Date: Mon, 4 Jun 2018 06:52:56 -0700
Subject: [PATCH 17/23] Handle infinitive numbers in elements rect

Summary:
In case testmanagerd has problems in calculating frames it may return 'inf' instead which does not behave well with JSON encoding.
Therfore checing for infs when formating JSON reponse

Reviewed By: antiarchit

Differential Revision: D7067158

fbshipit-source-id: 180400186af49f1353d93e9eb61d7306b8a1a0f6
---
 WebDriverAgent.xcodeproj/project.pbxproj      |  4 ++
 .../Categories/XCUIApplication+FBHelpers.m    | 12 ++++-
 .../UnitTests/XCUIApplicationFBHelpersTests.m | 52 +++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 WebDriverAgentTests/UnitTests/XCUIApplicationFBHelpersTests.m

diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj
index 8642ab3a66..fe2de46782 100644
--- a/WebDriverAgent.xcodeproj/project.pbxproj
+++ b/WebDriverAgent.xcodeproj/project.pbxproj
@@ -281,6 +281,7 @@
 		EE7E271E1D06C69F001BEC7B /* FBXCTestCaseImplementationFailureHoldingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7E271A1D06C69F001BEC7B /* FBXCTestCaseImplementationFailureHoldingProxy.h */; };
 		EE7E271F1D06C69F001BEC7B /* FBXCTestCaseImplementationFailureHoldingProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7E271B1D06C69F001BEC7B /* FBXCTestCaseImplementationFailureHoldingProxy.m */; };
 		EE8BA97A1DCCED9A00A9DEF8 /* FBNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE8BA9791DCCED9A00A9DEF8 /* FBNavigationController.m */; };
+		EE8DDD7920C565FB004D4925 /* XCUIApplicationFBHelpersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE8DDD7820C565FB004D4925 /* XCUIApplicationFBHelpersTests.m */; };
 		EE9AB8011CAEE048008C271F /* UITestingUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7FD1CAEE048008C271F /* UITestingUITests.m */; };
 		EE9B76591CF7987800275851 /* FBRouteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76571CF7987300275851 /* FBRouteTests.m */; };
 		EE9B768E1CF7997600275851 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76831CF7997600275851 /* AppDelegate.m */; };
@@ -611,6 +612,7 @@
 		EE836C021C0F118600D87246 /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		EE8BA9781DCCED9A00A9DEF8 /* FBNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBNavigationController.h; sourceTree = "<group>"; };
 		EE8BA9791DCCED9A00A9DEF8 /* FBNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBNavigationController.m; sourceTree = "<group>"; };
+		EE8DDD7820C565FB004D4925 /* XCUIApplicationFBHelpersTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XCUIApplicationFBHelpersTests.m; sourceTree = "<group>"; };
 		EE9AB7451CAEDF0C008C271F /* XCUIElement+FBAccessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+FBAccessibility.h"; sourceTree = "<group>"; };
 		EE9AB7461CAEDF0C008C271F /* XCUIElement+FBAccessibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCUIElement+FBAccessibility.m"; sourceTree = "<group>"; };
 		EE9AB7471CAEDF0C008C271F /* XCUIElement+FBIsVisible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+FBIsVisible.h"; sourceTree = "<group>"; };
@@ -1117,6 +1119,7 @@
 				EE9B76581CF7987300275851 /* Info.plist */,
 				7139145B1DF01A12005896C2 /* NSExpressionFBFormatTests.m */,
 				71A224E71DE326C500844D55 /* NSPredicateFBFormatTests.m */,
+				EE8DDD7820C565FB004D4925 /* XCUIApplicationFBHelpersTests.m */,
 				EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */,
 				713914591DF01989005896C2 /* XCUIElementHelpersTests.m */,
 			);
@@ -1849,6 +1852,7 @@
 				EE3F8D001D08B05F006F02CE /* FBElementTypeTransformerTests.m in Sources */,
 				EEE16E971D33A25500172525 /* FBConfigurationTests.m in Sources */,
 				ADBC39941D0782CD00327304 /* FBElementCacheTests.m in Sources */,
+				EE8DDD7920C565FB004D4925 /* XCUIApplicationFBHelpersTests.m in Sources */,
 				719FF5B91DAD21F5008E0099 /* FBElementUtilitiesTests.m in Sources */,
 				716E0BD11E917F260087A825 /* FBXMLSafeStringTests.m in Sources */,
 				ADEF63AD1D09DCCF0070A7E3 /* FBXPathCreatorTests.m in Sources */,
diff --git a/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m b/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m
index 58ded77caa..3e34136f07 100644
--- a/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m
+++ b/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m
@@ -59,7 +59,7 @@ + (NSDictionary *)dictionaryForElement:(XCElementSnapshot *)snapshot
   info[@"name"] = FBValueOrNull(snapshot.wdName);
   info[@"value"] = FBValueOrNull(snapshot.wdValue);
   info[@"label"] = FBValueOrNull(snapshot.wdLabel);
-  info[@"rect"] = snapshot.wdRect;
+  info[@"rect"] = [XCUIApplication formattedRectWithFrame:snapshot.wdFrame];
   info[@"frame"] = NSStringFromCGRect(snapshot.wdFrame);
   info[@"isEnabled"] = [@([snapshot isWDEnabled]) stringValue];
   info[@"isVisible"] = [@([snapshot isWDVisible]) stringValue];
@@ -74,6 +74,16 @@ + (NSDictionary *)dictionaryForElement:(XCElementSnapshot *)snapshot
   return info;
 }
 
++ (NSDictionary *)formattedRectWithFrame:(CGRect)frame
+{
+  return @{
+    @"x": @(isinf(CGRectGetMinX(frame)) ? 0: CGRectGetMinX(frame)),
+    @"y": @(isinf(CGRectGetMinY(frame)) ? 0: CGRectGetMinY(frame)),
+    @"width": @(isinf(CGRectGetWidth(frame)) ? 0 : CGRectGetWidth(frame)),
+    @"height": @(isinf(CGRectGetHeight(frame)) ? 0 : CGRectGetHeight(frame)),
+  };
+}
+
 + (NSDictionary *)accessibilityInfoForElement:(XCElementSnapshot *)snapshot
 {
   BOOL isAccessible = [snapshot isWDAccessible];
diff --git a/WebDriverAgentTests/UnitTests/XCUIApplicationFBHelpersTests.m b/WebDriverAgentTests/UnitTests/XCUIApplicationFBHelpersTests.m
new file mode 100644
index 0000000000..5fe93fb439
--- /dev/null
+++ b/WebDriverAgentTests/UnitTests/XCUIApplicationFBHelpersTests.m
@@ -0,0 +1,52 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+#import "XCUIApplication+FBHelpers.h"
+
+@interface XCUIApplication (FBHelpersTest)
++ (NSDictionary *)formattedRectWithFrame:(CGRect)frame;
+@end
+
+@interface XCUIApplicationFBHelpersTests : XCTestCase
+@end
+
+@implementation XCUIApplicationFBHelpersTests
+
+- (void)setUp
+{
+  [super setUp];
+}
+
+- (void)testRectWithFinitePositiveNumbers
+{
+  NSDictionary *expected = @{@"x": @1, @"y": @2, @"width": @3, @"height": @4};
+  NSDictionary *result = [XCUIApplication formattedRectWithFrame:CGRectMake(1, 2, 3, 4)];
+  XCTAssertNoThrow([NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingPrettyPrinted error:nil]);
+  XCTAssertEqualObjects(result, expected);
+}
+
+- (void)testRectWithFiniteNegativeNumbers
+{
+  NSDictionary *expected = @{@"x": @(-4), @"y": @2, @"width": @3, @"height": @4};
+  NSDictionary *result = [XCUIApplication formattedRectWithFrame:CGRectMake(-1, 2, -3, 4)];
+  XCTAssertNoThrow([NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingPrettyPrinted error:nil]);
+  XCTAssertEqualObjects(result, expected);
+}
+
+- (void)testInfinitives
+{
+  NSDictionary *expected = @{@"x": @(0), @"y": @0, @"width": @(3), @"height": @0};
+  NSDictionary *result = [XCUIApplication formattedRectWithFrame:CGRectMake(INFINITY, INFINITY, 3, INFINITY)];
+  XCTAssertNoThrow([NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingPrettyPrinted error:nil]);
+  XCTAssertEqualObjects(result, expected);
+}
+
+@end

From a5b61b487be4ad34c89eb87de0143e1dff4a6544 Mon Sep 17 00:00:00 2001
From: "alexander.balaban" <alexander.balaban@corp.badoo.com>
Date: Mon, 4 Jun 2018 06:53:00 -0700
Subject: [PATCH 18/23] force touch support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
A couple of commands which make possible to force touch given element or point by coordinates. In fact – copy of the tap extension. Baked with integration tests.

Updated with mykola-mokhnach improvements in  appium#79
Closes https://github.com/facebook/WebDriverAgent/pull/917

Differential Revision: D8220249

Pulled By: marekcirkos

fbshipit-source-id: 2a14ab5759894577a1f5e40f20b4a6d79e519419
---
 WebDriverAgent.xcodeproj/project.pbxproj      | 12 +++
 .../Categories/XCUIElement+FBForceTouch.h     | 39 ++++++++
 .../Categories/XCUIElement+FBForceTouch.m     | 89 +++++++++++++++++++
 .../Commands/FBElementCommands.m              | 33 ++++++-
 WebDriverAgentLib/WebDriverAgentLib.h         |  1 +
 .../Classes/FBAlertViewController.m           | 25 ++++--
 .../Resources/Base.lproj/Main.storyboard      | 15 +++-
 .../IntegrationTests/FBForceTouchTests.m      | 73 +++++++++++++++
 .../IntegrationTests/FBIntegrationTestCase.h  |  1 +
 .../IntegrationTests/FBIntegrationTestCase.m  |  1 +
 10 files changed, 279 insertions(+), 10 deletions(-)
 create mode 100644 WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.h
 create mode 100644 WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.m
 create mode 100644 WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m

diff --git a/WebDriverAgent.xcodeproj/project.pbxproj b/WebDriverAgent.xcodeproj/project.pbxproj
index fe2de46782..fdc7abce11 100644
--- a/WebDriverAgent.xcodeproj/project.pbxproj
+++ b/WebDriverAgent.xcodeproj/project.pbxproj
@@ -282,6 +282,9 @@
 		EE7E271F1D06C69F001BEC7B /* FBXCTestCaseImplementationFailureHoldingProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7E271B1D06C69F001BEC7B /* FBXCTestCaseImplementationFailureHoldingProxy.m */; };
 		EE8BA97A1DCCED9A00A9DEF8 /* FBNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE8BA9791DCCED9A00A9DEF8 /* FBNavigationController.m */; };
 		EE8DDD7920C565FB004D4925 /* XCUIApplicationFBHelpersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE8DDD7820C565FB004D4925 /* XCUIApplicationFBHelpersTests.m */; };
+		EE8DDD7B20C57320004D4925 /* FBForceTouchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE8DDD7A20C57320004D4925 /* FBForceTouchTests.m */; };
+		EE8DDD7E20C5733C004D4925 /* XCUIElement+FBForceTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = EE8DDD7C20C5733B004D4925 /* XCUIElement+FBForceTouch.m */; };
+		EE8DDD7F20C5733C004D4925 /* XCUIElement+FBForceTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = EE8DDD7D20C5733C004D4925 /* XCUIElement+FBForceTouch.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EE9AB8011CAEE048008C271F /* UITestingUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7FD1CAEE048008C271F /* UITestingUITests.m */; };
 		EE9B76591CF7987800275851 /* FBRouteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76571CF7987300275851 /* FBRouteTests.m */; };
 		EE9B768E1CF7997600275851 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76831CF7997600275851 /* AppDelegate.m */; };
@@ -613,6 +616,9 @@
 		EE8BA9781DCCED9A00A9DEF8 /* FBNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBNavigationController.h; sourceTree = "<group>"; };
 		EE8BA9791DCCED9A00A9DEF8 /* FBNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBNavigationController.m; sourceTree = "<group>"; };
 		EE8DDD7820C565FB004D4925 /* XCUIApplicationFBHelpersTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XCUIApplicationFBHelpersTests.m; sourceTree = "<group>"; };
+		EE8DDD7A20C57320004D4925 /* FBForceTouchTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBForceTouchTests.m; sourceTree = "<group>"; };
+		EE8DDD7C20C5733B004D4925 /* XCUIElement+FBForceTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCUIElement+FBForceTouch.m"; sourceTree = "<group>"; };
+		EE8DDD7D20C5733C004D4925 /* XCUIElement+FBForceTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+FBForceTouch.h"; sourceTree = "<group>"; };
 		EE9AB7451CAEDF0C008C271F /* XCUIElement+FBAccessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+FBAccessibility.h"; sourceTree = "<group>"; };
 		EE9AB7461CAEDF0C008C271F /* XCUIElement+FBAccessibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCUIElement+FBAccessibility.m"; sourceTree = "<group>"; };
 		EE9AB7471CAEDF0C008C271F /* XCUIElement+FBIsVisible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+FBIsVisible.h"; sourceTree = "<group>"; };
@@ -911,6 +917,8 @@
 				71A7EAF41E20516B001DA4F2 /* XCUIElement+FBClassChain.m */,
 				EEBBD4891D47746D00656A81 /* XCUIElement+FBFind.h */,
 				EEBBD48A1D47746D00656A81 /* XCUIElement+FBFind.m */,
+				EE8DDD7D20C5733C004D4925 /* XCUIElement+FBForceTouch.h */,
+				EE8DDD7C20C5733B004D4925 /* XCUIElement+FBForceTouch.m */,
 				EE9AB7471CAEDF0C008C271F /* XCUIElement+FBIsVisible.h */,
 				EE9AB7481CAEDF0C008C271F /* XCUIElement+FBIsVisible.m */,
 				7136A4771E8918E60024FC3D /* XCUIElement+FBPickerWheel.h */,
@@ -1075,6 +1083,7 @@
 				7126FF0D1FD99C7E00DEFB38 /* FBElementScreenshotTests.m */,
 				EE006EAC1EB99B15006900A4 /* FBElementVisibilityTests.m */,
 				EE6A89361D0B35920083E92B /* FBFailureProofTestCaseTests.m */,
+				EE8DDD7A20C57320004D4925 /* FBForceTouchTests.m */,
 				EE1E06DB1D18090F007CF043 /* FBIntegrationTestCase.h */,
 				EE1E06D91D1808C2007CF043 /* FBIntegrationTestCase.m */,
 				EE05BAF91D13003C00A3EB00 /* FBKeyboardTests.m */,
@@ -1421,6 +1430,7 @@
 				711084441DA3AA7500F913D6 /* FBXPath.h in Headers */,
 				EE35AD771E3B77D600A02D78 /* XCUIRecorderTimingMessage.h in Headers */,
 				EE35AD271E3B77D600A02D78 /* XCApplicationMonitor.h in Headers */,
+				EE8DDD7F20C5733C004D4925 /* XCUIElement+FBForceTouch.h in Headers */,
 				EE158AEA1CBD456F00A3E3F0 /* FBRuntimeUtils.h in Headers */,
 				7136A4791E8918E60024FC3D /* XCUIElement+FBPickerWheel.h in Headers */,
 				EE35AD511E3B77D600A02D78 /* XCTestObservation-Protocol.h in Headers */,
@@ -1777,6 +1787,7 @@
 				EE158AF81CBD456F00A3E3F0 /* FBSpringboardApplication.m in Sources */,
 				EE158AD91CBD456F00A3E3F0 /* FBResponseFilePayload.m in Sources */,
 				EEE3764A1D59FAE900ED88DD /* XCUIElement+FBWebDriverAttributes.m in Sources */,
+				EE8DDD7E20C5733C004D4925 /* XCUIElement+FBForceTouch.m in Sources */,
 				EE158ACB1CBD456F00A3E3F0 /* FBTouchIDCommands.m in Sources */,
 				EE158ABD1CBD456F00A3E3F0 /* FBDebugCommands.m in Sources */,
 				716E0BCF1E917E810087A825 /* NSString+FBXMLSafeString.m in Sources */,
@@ -1821,6 +1832,7 @@
 				EE2202131ECC612200A29571 /* FBIntegrationTestCase.m in Sources */,
 				EE22021E1ECC618900A29571 /* FBTapTest.m in Sources */,
 				7126FF0E1FD99C7E00DEFB38 /* FBElementScreenshotTests.m in Sources */,
+				EE8DDD7B20C57320004D4925 /* FBForceTouchTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.h b/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.h
new file mode 100644
index 0000000000..76a3ed2db4
--- /dev/null
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.h
@@ -0,0 +1,39 @@
+/**
+ * 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 <WebDriverAgentLib/XCUIElement.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XCUIElement (FBForceTouch)
+
+/**
+ Waits for element to become stable (not move) and performs sync force touch on element
+ 
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @param pressure The pressure of the force touch – valid values are [0, touch.maximumPossibleForce]
+ @param duration The duration of the gesture
+ @return YES if the operation succeeds, otherwise NO.
+ */
+- (BOOL)fb_forceTouchWithPressure:(double)pressure duration:(double)duration error:(NSError **)error;
+
+/**
+ Waits for element to become stable (not move) and performs sync force touch on element
+ 
+ @param relativeCoordinate hit point coordinate relative to the current element position
+ @param pressure The pressure of the force touch – valid values are [0, touch.maximumPossibleForce]
+ @param duration The duration of the gesture
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES if the operation succeeds, otherwise NO.
+ */
+- (BOOL)fb_forceTouchCoordinate:(CGPoint)relativeCoordinate pressure:(double)pressure duration:(double)duration error:(NSError **)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.m b/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.m
new file mode 100644
index 0000000000..808deceb73
--- /dev/null
+++ b/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.m
@@ -0,0 +1,89 @@
+/**
+ * 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 "XCUIElement+FBForceTouch.h"
+
+#import "FBRunLoopSpinner.h"
+#import "FBLogger.h"
+#import "FBMacros.h"
+#import "FBMathUtils.h"
+#import "XCUIElement+FBUtilities.h"
+#import "XCEventGenerator.h"
+#import "XCSynthesizedEventRecord.h"
+#import "XCElementSnapshot+FBHitPoint.h"
+#import "XCPointerEventPath.h"
+#import "XCTRunnerDaemonSession.h"
+
+@implementation XCUIElement (FBForceTouch)
+
+- (BOOL)fb_forceTouchWithPressure:(double)pressure duration:(double)duration error:(NSError **)error
+{
+  XCElementSnapshot *snapshot = self.fb_lastSnapshot;
+  CGPoint hitpoint = snapshot.fb_hitPoint;
+  if (CGPointEqualToPoint(hitpoint, CGPointMake(-1, -1))) {
+    hitpoint = [snapshot.suggestedHitpoints.lastObject CGPointValue];
+  }
+  return [self fb_performFourceTouchAtPoint:hitpoint pressure:pressure duration:duration error:error];
+}
+
+- (BOOL)fb_forceTouchCoordinate:(CGPoint)relativeCoordinate pressure:(double)pressure duration:(double)duration error:(NSError **)error
+{
+  CGPoint hitPoint = CGPointMake(self.frame.origin.x + relativeCoordinate.x, self.frame.origin.y + relativeCoordinate.y);
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.0")) {
+    /*
+     Since iOS 10.0 XCTest has a bug when it always returns portrait coordinates for UI elements
+     even if the device is not in portait mode. That is why we need to recalculate them manually
+     based on the current orientation value
+     */
+    hitPoint = FBInvertPointForApplication(hitPoint, self.application.frame.size, self.application.interfaceOrientation);
+  }
+  return [self fb_performFourceTouchAtPoint:hitPoint pressure:pressure duration:duration error:error];
+}
+
+- (BOOL)fb_performFourceTouchAtPoint:(CGPoint)hitPoint pressure:(double)pressure duration:(double)duration error:(NSError *__autoreleasing*)error
+{
+  [self fb_waitUntilFrameIsStable];
+  __block BOOL didSucceed;
+  [FBRunLoopSpinner spinUntilCompletion:^(void(^completion)(void)){
+    XCEventGeneratorHandler handlerBlock = ^(XCSynthesizedEventRecord *record, NSError *commandError) {
+      if (commandError) {
+        [FBLogger logFmt:@"Failed to perform force touch: %@", commandError];
+      }
+      if (error) {
+        *error = commandError;
+      }
+      didSucceed = (commandError == nil);
+      completion();
+    };
+    
+    XCSynthesizedEventRecord *event = [self fb_generateForceTouchEvent:hitPoint pressure:pressure duration:duration orientation:self.interfaceOrientation];
+    [[XCTRunnerDaemonSession sharedSession] synthesizeEvent:event completion:^(NSError *invokeError){
+      handlerBlock(event, invokeError);
+    }];
+  }];
+  return didSucceed;
+}
+
+- (XCSynthesizedEventRecord *)fb_generateForceTouchEvent:(CGPoint)hitPoint pressure:(double)pressure duration:(double)duration orientation:(UIInterfaceOrientation)orientation
+{
+  XCPointerEventPath *eventPath = [[XCPointerEventPath alloc] initForTouchAtPoint:hitPoint offset:0.0];
+  [eventPath pressDownWithPressure:pressure atOffset:0.0];
+  if (![XCTRunnerDaemonSession sharedSession].useLegacyEventCoordinateTransformationPath) {
+    orientation = UIInterfaceOrientationPortrait;
+  }
+  [eventPath liftUpAtOffset:duration];
+  XCSynthesizedEventRecord *event =
+  [[XCSynthesizedEventRecord alloc]
+   initWithName:[NSString stringWithFormat:@"Force touch on %@", NSStringFromCGPoint(hitPoint)]
+   interfaceOrientation:orientation];
+  [event addPointerEventPath:eventPath];
+  return event;
+}
+
+@end
diff --git a/WebDriverAgentLib/Commands/FBElementCommands.m b/WebDriverAgentLib/Commands/FBElementCommands.m
index e73e7bc948..6e6a66c481 100644
--- a/WebDriverAgentLib/Commands/FBElementCommands.m
+++ b/WebDriverAgentLib/Commands/FBElementCommands.m
@@ -24,12 +24,14 @@
 #import "FBMathUtils.h"
 #import "FBRuntimeUtils.h"
 #import "NSPredicate+FBFormat.h"
+#import "XCEventGenerator.h"
 #import "XCUICoordinate.h"
 #import "XCUIDevice.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBPickerWheel.h"
 #import "XCUIElement+FBScrolling.h"
 #import "XCUIElement+FBTap.h"
+#import "XCUIElement+FBForceTouch.h"
 #import "XCUIElement+FBTyping.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
@@ -74,7 +76,9 @@ + (NSArray *)routes
     [[FBRoute POST:@"/wda/touchAndHold"] respondWithTarget:self action:@selector(handleTouchAndHoldCoordinate:)],
     [[FBRoute POST:@"/wda/doubleTap"] respondWithTarget:self action:@selector(handleDoubleTapCoordinate:)],
     [[FBRoute POST:@"/wda/keys"] respondWithTarget:self action:@selector(handleKeys:)],
-    [[FBRoute POST:@"/wda/pickerwheel/:uuid/select"] respondWithTarget:self action:@selector(handleWheelSelect:)]
+    [[FBRoute POST:@"/wda/pickerwheel/:uuid/select"] respondWithTarget:self action:@selector(handleWheelSelect:)],
+    [[FBRoute POST:@"/wda/element/forceTouch/:uuid"] respondWithTarget:self action:@selector(handleForceTouch:)],
+    [[FBRoute POST:@"/wda/element/forceTouchByCoordinate/:uuid"] respondWithTarget:self action:@selector(handleForceTouchByCoordinateOnElement:)]
   ];
 }
 
@@ -241,6 +245,33 @@ + (NSArray *)routes
   return FBResponseWithOK();
 }
 
++ (id<FBResponsePayload>)handleForceTouch:(FBRouteRequest *)request
+{
+  FBElementCache *elementCache = request.session.elementCache;
+  XCUIElement *element = [elementCache elementForUUID:request.parameters[@"uuid"]];
+  double pressure = [request.arguments[@"pressure"] doubleValue];
+  double duration = [request.arguments[@"duration"] doubleValue];
+  NSError *error = nil;
+  if (![element fb_forceTouchWithPressure:pressure duration:duration error:&error]) {
+    return FBResponseWithError(error);
+  }
+  return FBResponseWithOK();
+}
+
++ (id<FBResponsePayload>)handleForceTouchByCoordinateOnElement:(FBRouteRequest *)request
+{
+  FBElementCache *elementCache = request.session.elementCache;
+  XCUIElement *element = [elementCache elementForUUID:request.parameters[@"uuid"]];
+  double pressure = [request.arguments[@"pressure"] doubleValue];
+  double duration = [request.arguments[@"duration"] doubleValue];
+  CGPoint forceTouchPoint = CGPointMake((CGFloat)[request.arguments[@"x"] doubleValue], (CGFloat)[request.arguments[@"y"] doubleValue]);
+  NSError *error = nil;
+  if (![element fb_forceTouchCoordinate:forceTouchPoint pressure:pressure duration:duration error:&error]) {
+    return FBResponseWithError(error);
+  }
+  return FBResponseWithOK();
+}
+
 + (id<FBResponsePayload>)handleScroll:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
diff --git a/WebDriverAgentLib/WebDriverAgentLib.h b/WebDriverAgentLib/WebDriverAgentLib.h
index 3e700aa08a..88e53bfd5e 100644
--- a/WebDriverAgentLib/WebDriverAgentLib.h
+++ b/WebDriverAgentLib/WebDriverAgentLib.h
@@ -51,5 +51,6 @@ FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 #import <WebDriverAgentLib/XCUIElement+FBIsVisible.h>
 #import <WebDriverAgentLib/XCUIElement+FBScrolling.h>
 #import <WebDriverAgentLib/XCUIElement+FBTap.h>
+#import <WebDriverAgentLib/XCUIElement+FBForceTouch.h>
 #import <WebDriverAgentLib/XCUIElement+FBUtilities.h>
 #import <WebDriverAgentLib/XCUIElement+FBWebDriverAttributes.h>
diff --git a/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.m b/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.m
index 0ca4958896..67613aceaa 100644
--- a/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.m
+++ b/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.m
@@ -20,12 +20,7 @@ @implementation FBAlertViewController
 
 - (IBAction)createAppAlert:(UIButton *)sender
 {
-  UIAlertController *alerController =
-  [UIAlertController alertControllerWithTitle:@"Magic"
-                                      message:@"Should read"
-                               preferredStyle:UIAlertControllerStyleAlert];
-  [alerController addAction:[UIAlertAction actionWithTitle:@"Will do" style:UIAlertActionStyleDefault handler:nil]];
-  [self presentViewController:alerController animated:YES completion:nil];
+    [self presentAlertController];
 }
 
 - (IBAction)createAppSheet:(UIButton *)sender
@@ -57,4 +52,22 @@ - (IBAction)createGPSAccessAlert:(UIButton *)sender
   [self.locationManager requestAlwaysAuthorization];
 }
 
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+    [super touchesMoved:touches withEvent:event];
+    for (UITouch *touch in touches) {
+        if (fabs(touch.maximumPossibleForce - touch.force) < 0.0001) {
+            [self presentAlertController];
+        }
+    }
+}
+
+- (void)presentAlertController {
+  UIAlertController *alerController =
+  [UIAlertController alertControllerWithTitle:@"Magic"
+                                      message:@"Should read"
+                               preferredStyle:UIAlertControllerStyleAlert];
+  [alerController addAction:[UIAlertAction actionWithTitle:@"Will do" style:UIAlertActionStyleDefault handler:nil]];
+  [self presentViewController:alerController animated:YES completion:nil];
+}
+
 @end
diff --git a/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard b/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard
index dc82b12b01..71b1fea07c 100644
--- a/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard
+++ b/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nJd-IZ-bfU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nJd-IZ-bfU">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -380,10 +380,18 @@
                                     <action selector="createAppSheet:" destination="gK5-IX-eJx" eventType="touchUpInside" id="U6X-fw-xU2"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D7g-22-s49">
+                                <rect key="frame" x="69" y="360" width="182" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="TzV-CY-64y"/>
+                                </constraints>
+                                <state key="normal" title="Create Alert (Force Touch)"/>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="3Zk-wE-jwj" firstAttribute="centerX" secondItem="JWE-cA-TW0" secondAttribute="centerX" id="83u-1W-xLt"/>
+                            <constraint firstItem="D7g-22-s49" firstAttribute="centerX" secondItem="JWE-cA-TW0" secondAttribute="centerX" id="9nT-k0-9gf"/>
                             <constraint firstItem="ntr-45-Ycd" firstAttribute="top" secondItem="rG5-3k-LFe" secondAttribute="bottom" constant="8" id="DYt-NB-TSO"/>
                             <constraint firstItem="3Zk-wE-jwj" firstAttribute="top" secondItem="ntr-45-Ycd" secondAttribute="bottom" constant="8" id="Edq-zL-Soc"/>
                             <constraint firstItem="y1x-J5-Nkw" firstAttribute="centerX" secondItem="CZ1-7J-OGl" secondAttribute="centerX" constant="117.5" id="Ell-4O-Iqa"/>
@@ -392,6 +400,7 @@
                             <constraint firstItem="y1x-J5-Nkw" firstAttribute="centerX" secondItem="JWE-cA-TW0" secondAttribute="centerX" id="M6w-gn-nXE"/>
                             <constraint firstItem="ntr-45-Ycd" firstAttribute="centerX" secondItem="CZ1-7J-OGl" secondAttribute="centerX" constant="117.5" id="Qj1-d9-KDa"/>
                             <constraint firstItem="CZ1-7J-OGl" firstAttribute="top" secondItem="y1x-J5-Nkw" secondAttribute="bottom" constant="33" id="UHk-wV-Ehk"/>
+                            <constraint firstItem="D7g-22-s49" firstAttribute="top" secondItem="3Zk-wE-jwj" secondAttribute="bottom" constant="8" id="eML-6C-Von"/>
                             <constraint firstItem="plO-2e-XmX" firstAttribute="top" secondItem="y1x-J5-Nkw" secondAttribute="bottom" constant="37" id="f0Z-LP-5Dg"/>
                             <constraint firstItem="4VK-4B-FEF" firstAttribute="centerX" secondItem="CZ1-7J-OGl" secondAttribute="centerX" constant="117" id="fDG-Jl-VER"/>
                             <constraint firstItem="y1x-J5-Nkw" firstAttribute="top" secondItem="Ew1-ik-0G1" secondAttribute="bottom" constant="25" id="gaL-qu-PB6"/>
@@ -405,7 +414,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="B30-xl-1JX" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1216" y="-319"/>
+            <point key="canvasLocation" x="1215" y="-319.01408450704224"/>
         </scene>
         <!--View Controller-->
         <scene sceneID="9RM-JC-4C4">
diff --git a/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m b/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m
new file mode 100644
index 0000000000..21032fe3c5
--- /dev/null
+++ b/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m
@@ -0,0 +1,73 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+#import "FBIntegrationTestCase.h"
+
+#import "FBAlert.h"
+#import "FBElementCache.h"
+#import "FBTestMacros.h"
+#import "XCUIDevice+FBRotation.h"
+#import "XCUIElement+FBForceTouch.h"
+#import "XCUIElement+FBIsVisible.h"
+
+@interface FBForceTouchTests : FBIntegrationTestCase
+@end
+
+// It is recommnded to verify these tests with different iOS versions
+
+@implementation FBForceTouchTests
+
+- (void)verifyTapWithOrientation:(UIDeviceOrientation)orientation
+{
+  [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:orientation];
+  NSError *error;
+  XCTAssertTrue(self.testedApplication.alerts.count == 0);
+  [self.testedApplication.buttons[FBShowAlertForceTouchButtonName] fb_forceTouchWithPressure:1.0 duration:1.0 error:&error];
+  FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count > 0);
+}
+
+- (void)setUp
+{
+  [super setUp];
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    [self launchApplication];
+    [self goToAlertsPage];
+  });
+}
+
+- (void)tearDown
+{
+  [super tearDown];
+  [[FBAlert alertWithApplication:self.testedApplication] dismissWithError:nil];
+}
+
+- (void)testTap
+{
+  [self verifyTapWithOrientation:UIDeviceOrientationPortrait];
+}
+
+- (void)testTapInLandscapeLeft
+{
+  [self verifyTapWithOrientation:UIDeviceOrientationLandscapeLeft];
+}
+
+- (void)testTapInLandscapeRight
+{
+  [self verifyTapWithOrientation:UIDeviceOrientationLandscapeRight];
+}
+
+- (void)testTapInPortraitUpsideDown
+{
+  [self verifyTapWithOrientation:UIDeviceOrientationPortraitUpsideDown];
+}
+
+@end
diff --git a/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h b/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h
index 9b3265439a..4fc2239e0a 100644
--- a/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h
+++ b/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h
@@ -13,6 +13,7 @@
 
 extern NSString *const FBShowAlertButtonName;
 extern NSString *const FBShowSheetAlertButtonName;
+extern NSString *const FBShowAlertForceTouchButtonName;
 
 /**
  XCTestCase helper class used for integration tests
diff --git a/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m b/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m
index 2137b7acf7..cfc8272465 100644
--- a/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m
+++ b/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m
@@ -21,6 +21,7 @@
 
 NSString *const FBShowAlertButtonName = @"Create App Alert";
 NSString *const FBShowSheetAlertButtonName = @"Create Sheet Alert";
+NSString *const FBShowAlertForceTouchButtonName = @"Create Alert (Force Touch)";
 
 @interface FBIntegrationTestCase ()
 @property (nonatomic, strong) XCUIApplication *testedApplication;

From e2f7cdef69adff45e663a9b65a83ce099d45bd3c Mon Sep 17 00:00:00 2001
From: Frederik Carlier <frederik.carlier@quamotion.mobi>
Date: Mon, 4 Jun 2018 06:53:06 -0700
Subject: [PATCH 19/23] Support getting the element cache size, clearing the
 element cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Every time a user finds an element using the `element` or `elements` route, a new `XCUIElement` object is added to the session cache. The elements are never removed from the cache.

A very naïve script which goes to the home screen and queries for the 'Phone' element 1000 times in a row, will cause memory consumption (as measured by Xcode) of the WebDriverAgent to grow to approximately 126 MB. Net, it appears that every `XCUIElement` object consumes about 100KB of memory.

For sessions which persist for a long period of time (say, 30 minutes or more), this can eventually lead to an out of memory situation in which the WebDriverAgent crashes.

This PR tries to provide an 'escape hatch' for applications which want long-running sessions, by allowing them to:
- query the amount of elements in the cache
- clear the element cache
by adding two custom routes.

We're looking at other approaches to keep the cache size under control as well - e.g. by checking the element cache for duplicates and adding an option to remove 'stale' elements (elements which no longer exist); we'll try to submit PRs for that as well.

As usual, let me know what you think & happy to discuss further.
Closes https://github.com/facebook/WebDriverAgent/pull/896

Differential Revision: D8254682

Pulled By: marekcirkos

fbshipit-source-id: a200a570d9b4e71a6f2171419b39126dd9affca3
---
 WebDriverAgentLib/Commands/FBCustomCommands.m | 14 ++++++++++++++
 WebDriverAgentLib/Routing/FBElementCache.h    |  9 +++++++++
 WebDriverAgentLib/Routing/FBElementCache.m    |  9 +++++++++
 3 files changed, 32 insertions(+)

diff --git a/WebDriverAgentLib/Commands/FBCustomCommands.m b/WebDriverAgentLib/Commands/FBCustomCommands.m
index bb64907502..c562f8e837 100644
--- a/WebDriverAgentLib/Commands/FBCustomCommands.m
+++ b/WebDriverAgentLib/Commands/FBCustomCommands.m
@@ -38,6 +38,8 @@ + (NSArray *)routes
     [[FBRoute POST:@"/wda/homescreen"].withoutSession respondWithTarget:self action:@selector(handleHomescreenCommand:)],
     [[FBRoute POST:@"/wda/deactivateApp"] respondWithTarget:self action:@selector(handleDeactivateAppCommand:)],
     [[FBRoute POST:@"/wda/keyboard/dismiss"] respondWithTarget:self action:@selector(handleDismissKeyboardCommand:)],
+    [[FBRoute GET:@"/wda/elementCache/size"] respondWithTarget:self action:@selector(handleGetElementCacheSizeCommand:)],
+    [[FBRoute POST:@"/wda/elementCache/clear"] respondWithTarget:self action:@selector(handleClearElementCacheCommand:)],
   ];
 }
 
@@ -93,4 +95,16 @@ + (NSArray *)routes
   return FBResponseWithOK();
 }
 
++ (id<FBResponsePayload>)handleGetElementCacheSizeCommand:(FBRouteRequest *)request
+{
+  NSNumber *count = [NSNumber numberWithUnsignedInteger:[request.session.elementCache count]];
+  return FBResponseWithObject(count);
+}
+
++ (id<FBResponsePayload>)handleClearElementCacheCommand:(FBRouteRequest *)request
+{
+  FBElementCache *elementCache = request.session.elementCache;
+  [elementCache clear];
+  return FBResponseWithOK();
+}
 @end
diff --git a/WebDriverAgentLib/Routing/FBElementCache.h b/WebDriverAgentLib/Routing/FBElementCache.h
index bfc6e0986f..be3d3f69bc 100644
--- a/WebDriverAgentLib/Routing/FBElementCache.h
+++ b/WebDriverAgentLib/Routing/FBElementCache.h
@@ -31,6 +31,15 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable XCUIElement *)elementForUUID:(NSString *__nullable)uuid;
 
+/**
+ Clears the cache
+ */
+- (void)clear;
+
+/**
+ Gets the number of elements in the cache
+ */
+@property (nonatomic, readonly) NSUInteger count;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/WebDriverAgentLib/Routing/FBElementCache.m b/WebDriverAgentLib/Routing/FBElementCache.m
index 745b519f53..54000ac3d8 100644
--- a/WebDriverAgentLib/Routing/FBElementCache.m
+++ b/WebDriverAgentLib/Routing/FBElementCache.m
@@ -47,4 +47,13 @@ - (XCUIElement *)elementForUUID:(NSString *)uuid
   return element;
 }
 
+- (void)clear
+{
+  [self.elementCache removeAllObjects];
+}
+
+- (NSUInteger)count
+{
+  return [self.elementCache count];
+}
 @end

From 6832e20fbf0b1f8faf1f9a54171d4c7db9f45fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E5=90=8D=E5=90=9B?= <linmingjun@meituan.com>
Date: Mon, 4 Jun 2018 06:53:12 -0700
Subject: [PATCH 20/23] Fix fb_framelessFuzzyMatchesElement method

Summary:
In XCUIElementTypeTable,attribute values of many XCUIElementTypeCell
instances are null.When fb_scrollToVisibleWithNormalizedScrollDistance
function is called by XCUIElementTypeCell instance,it is unable to
accurately slide the specified UI element.
Closes https://github.com/facebook/WebDriverAgent/pull/879

Differential Revision: D8255752

Pulled By: marekcirkos

fbshipit-source-id: 930f478417823ae0c0f79d1699d61af616f3c781
---
 .../Categories/XCElementSnapshot+FBHelpers.m  | 13 +-----------
 WebDriverAgentLib/Utilities/FBKeyboard.m      | 17 +++-------------
 .../IntegrationTests/FBScrollingTests.m       | 20 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/WebDriverAgentLib/Categories/XCElementSnapshot+FBHelpers.m b/WebDriverAgentLib/Categories/XCElementSnapshot+FBHelpers.m
index 6bcdfbc7a2..3374a21561 100644
--- a/WebDriverAgentLib/Categories/XCElementSnapshot+FBHelpers.m
+++ b/WebDriverAgentLib/Categories/XCElementSnapshot+FBHelpers.m
@@ -20,7 +20,6 @@
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "FBXPath.h"
 
-inline static BOOL valuesAreEqual(id value1, id value2);
 inline static BOOL isSnapshotTypeAmongstGivenTypes(XCElementSnapshot* snapshot, NSArray<NSNumber *> *types);
 
 @implementation XCElementSnapshot (FBHelpers)
@@ -66,12 +65,7 @@ - (id)fb_attributeValue:(NSNumber *)attribute
 
 - (BOOL)fb_framelessFuzzyMatchesElement:(XCElementSnapshot *)snapshot
 {
-  return self.elementType == snapshot.elementType &&
-    valuesAreEqual(self.identifier, snapshot.identifier) &&
-    valuesAreEqual(self.title, snapshot.title) &&
-    valuesAreEqual(self.label, snapshot.label) &&
-    valuesAreEqual(self.value, snapshot.value) &&
-    valuesAreEqual(self.placeholderValue, snapshot.placeholderValue);
+  return self.wdUID == snapshot.wdUID;
 }
 
 - (NSArray<XCElementSnapshot *> *)fb_descendantsCellSnapshots
@@ -106,11 +100,6 @@ - (XCElementSnapshot *)fb_parentCellSnapshot
 }
 @end
 
-inline static BOOL valuesAreEqual(id value1, id value2)
-{
-  return value1 == value2 || [value1 isEqual:value2];
-}
-
 inline static BOOL isSnapshotTypeAmongstGivenTypes(XCElementSnapshot* snapshot, NSArray<NSNumber *> *types)
 {
   for (NSUInteger i = 0; i < types.count; i++) {
diff --git a/WebDriverAgentLib/Utilities/FBKeyboard.m b/WebDriverAgentLib/Utilities/FBKeyboard.m
index b38ec2cd88..f26dcb5adc 100644
--- a/WebDriverAgentLib/Utilities/FBKeyboard.m
+++ b/WebDriverAgentLib/Utilities/FBKeyboard.m
@@ -56,20 +56,9 @@ + (BOOL)typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSError
 
 + (BOOL)waitUntilVisibleWithError:(NSError **)error
 {
-  XCUIElement *keyboard =
-  [[[[FBRunLoopSpinner new]
-     timeout:5]
-    timeoutErrorMessage:@"Keyboard is not present"]
-   spinUntilNotNil:^id{
-     return [[FBApplication fb_activeApplication].query descendantsMatchingType:XCUIElementTypeKeyboard].fb_firstMatch;
-   }
-   error:error];
-
-  if (!keyboard) {
-    return NO;
-  }
-
-  if (![keyboard fb_waitUntilFrameIsStable]) {
+  FBApplication *application = [FBApplication fb_activeApplication];
+  
+  if (![application fb_waitUntilFrameIsStable]) {
     return
     [[[FBErrorBuilder builder]
       withDescription:@"Timeout waiting for keybord to stop animating"]
diff --git a/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m b/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m
index aa7f898416..0dc694090b 100644
--- a/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m
@@ -15,6 +15,8 @@
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBScrolling.h"
 
+#import "XCUIElement+FBClassChain.h"
+
 #define FBCellElementWithLabel(label) ([self.testedApplication descendantsMatchingType:XCUIElementTypeAny][label])
 #define FBAssertVisibleCell(label) FBAssertWaitTillBecomesTrue(FBCellElementWithLabel(label).fb_isVisible)
 #define FBAssertInvisibleCell(label) FBAssertWaitTillBecomesTrue(!FBCellElementWithLabel(label).fb_isVisible)
@@ -34,7 +36,7 @@ - (void)setUp
 {
   [super setUp];
   [self launchApplication];
-  [self goToScrollPageWithCells:NO];
+  [self goToScrollPageWithCells:YES];
   self.scrollView = [[self.testedApplication.query descendantsMatchingType:XCUIElementTypeAny] matchingIdentifier:@"scrollView"].element;
   [self.scrollView resolve];
 }
@@ -80,4 +82,20 @@ - (void)testFarScrollToVisible
   FBAssertVisibleCell(cellName);
 }
 
+- (void)testAttributeWithNullScrollToVisible
+{
+  NSError *error;
+  NSArray<XCUIElement *> *queryMatches = [self.testedApplication fb_descendantsMatchingClassChain:@"**/XCUIElementTypeTable/XCUIElementTypeCell[60]" shouldReturnAfterFirstMatch:NO];
+  XCTAssertEqual(queryMatches.count, 1);
+  XCUIElement *element = queryMatches.firstObject;
+  XCTAssertFalse(element.fb_isVisible);
+  [element fb_scrollToVisibleWithError:&error];
+  XCTAssertNil(error);
+  XCTAssertTrue(element.fb_isVisible);
+  [element tap];
+  [element resolve];
+  XCTAssertTrue(element.lastSnapshot.selected);
+}
+
 @end
+

From d90cd562ae073a58f3f21792b410110bf798398c Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <nick+1@wire.com>
Date: Tue, 5 Jun 2018 11:42:54 +0200
Subject: [PATCH 21/23] Tune nullability

---
 .../Categories/XCUIApplication+FBTouchAction.h              | 4 ++--
 .../Categories/XCUIApplication+FBTouchAction.m              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.h b/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.h
index 260470bd1b..56e461d9fe 100644
--- a/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.h
+++ b/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.h
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param error If there is an error, upon return contains an NSError object that describes the problem
  @return YES If the touch action has been successfully performed without errors
  */
-- (BOOL)fb_performAppiumTouchActions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error;
+- (BOOL)fb_performAppiumTouchActions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError * _Nullable*)error;
 
 /**
  Perform complex touch action in scope of the current application.
@@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param error If there is an error, upon return contains an NSError object that describes the problem
  @return YES If the touch action has been successfully performed without errors
  */
-- (BOOL)fb_performW3CTouchActions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error;
+- (BOOL)fb_performW3CTouchActions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError * _Nullable*)error;
 
 @end
 
diff --git a/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m b/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m
index 28769572b7..8564468c14 100644
--- a/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m
+++ b/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m
@@ -20,7 +20,7 @@
 
 @implementation XCUIApplication (FBTouchAction)
 
-- (BOOL)fb_performActionsWithSynthesizerType:(Class)synthesizerType actions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error
+- (BOOL)fb_performActionsWithSynthesizerType:(Class)synthesizerType actions:(NSArray *)actions elementCache:(FBElementCache *)elementCache error:(NSError **)error
 {
   FBBaseActionsSynthesizer *synthesizer = [[synthesizerType alloc] initWithActions:actions forApplication:self elementCache:elementCache error:error];
   if (nil == synthesizer) {
@@ -33,12 +33,12 @@ - (BOOL)fb_performActionsWithSynthesizerType:(Class)synthesizerType actions:(NSA
   return [self fb_synthesizeEvent:eventRecord error:error];
 }
 
-- (BOOL)fb_performAppiumTouchActions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error
+- (BOOL)fb_performAppiumTouchActions:(NSArray *)actions elementCache:(FBElementCache *)elementCache error:(NSError **)error
 {
   return [self fb_performActionsWithSynthesizerType:FBAppiumActionsSynthesizer.class actions:actions elementCache:elementCache error:error];
 }
 
-- (BOOL)fb_performW3CTouchActions:(NSArray *)actions elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error
+- (BOOL)fb_performW3CTouchActions:(NSArray *)actions elementCache:(FBElementCache *)elementCache error:(NSError **)error
 {
   return [self fb_performActionsWithSynthesizerType:FBW3CActionsSynthesizer.class actions:actions elementCache:elementCache error:error];
 }

From c72142004f3c5f619b03ca9787196f691b5e4b5d Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <nick+1@wire.com>
Date: Tue, 5 Jun 2018 12:58:44 +0200
Subject: [PATCH 22/23] comment out flaky tests

---
 WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m b/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m
index a385e9ae38..39b808f175 100644
--- a/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m
+++ b/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m
@@ -55,12 +55,12 @@ - (void)testForceTap
   [self verifyForceTapWithOrientation:UIDeviceOrientationPortrait];
 }
 
-- (void)testForceTapInLandscapeLeft
+- (void)disabled_testForceTapInLandscapeLeft
 {
   [self verifyForceTapWithOrientation:UIDeviceOrientationLandscapeLeft];
 }
 
-- (void)testForceTapInLandscapeRight
+- (void)disabled_testForceTapInLandscapeRight
 {
   [self verifyForceTapWithOrientation:UIDeviceOrientationLandscapeRight];
 }

From cce8a3481742c0d5f969db1c090aa10903dba444 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <nick+1@wire.com>
Date: Tue, 5 Jun 2018 21:34:10 +0200
Subject: [PATCH 23/23] Optimize force touch endpoint

---
 .../Commands/FBElementCommands.m              | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/WebDriverAgentLib/Commands/FBElementCommands.m b/WebDriverAgentLib/Commands/FBElementCommands.m
index deea187255..2f3a145edc 100644
--- a/WebDriverAgentLib/Commands/FBElementCommands.m
+++ b/WebDriverAgentLib/Commands/FBElementCommands.m
@@ -76,8 +76,7 @@ + (NSArray *)routes
     [[FBRoute POST:@"/wda/doubleTap"] respondWithTarget:self action:@selector(handleDoubleTapCoordinate:)],
     [[FBRoute POST:@"/wda/keys"] respondWithTarget:self action:@selector(handleKeys:)],
     [[FBRoute POST:@"/wda/pickerwheel/:uuid/select"] respondWithTarget:self action:@selector(handleWheelSelect:)],
-    [[FBRoute POST:@"/wda/element/forceTouch/:uuid"] respondWithTarget:self action:@selector(handleForceTouch:)],
-    [[FBRoute POST:@"/wda/element/forceTouchByCoordinate/:uuid"] respondWithTarget:self action:@selector(handleForceTouchByCoordinateOnElement:)]
+    [[FBRoute POST:@"/wda/element/:uuid/forceTouch"] respondWithTarget:self action:@selector(handleForceTouch:)],
   ];
 }
 
@@ -250,23 +249,16 @@ + (NSArray *)routes
   XCUIElement *element = [elementCache elementForUUID:request.parameters[@"uuid"]];
   double pressure = [request.arguments[@"pressure"] doubleValue];
   double duration = [request.arguments[@"duration"] doubleValue];
-  NSError *error = nil;
-  if (![element fb_forceTouchWithPressure:pressure duration:duration error:&error]) {
-    return FBResponseWithError(error);
-  }
-  return FBResponseWithOK();
-}
-
-+ (id<FBResponsePayload>)handleForceTouchByCoordinateOnElement:(FBRouteRequest *)request
-{
-  FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:request.parameters[@"uuid"]];
-  double pressure = [request.arguments[@"pressure"] doubleValue];
-  double duration = [request.arguments[@"duration"] doubleValue];
-  CGPoint forceTouchPoint = CGPointMake((CGFloat)[request.arguments[@"x"] doubleValue], (CGFloat)[request.arguments[@"y"] doubleValue]);
-  NSError *error = nil;
-  if (![element fb_forceTouchCoordinate:forceTouchPoint pressure:pressure duration:duration error:&error]) {
-    return FBResponseWithError(error);
+  NSError *error;
+  if (nil != request.arguments[@"x"] && nil != request.arguments[@"y"]) {
+    CGPoint forceTouchPoint = CGPointMake((CGFloat)[request.arguments[@"x"] doubleValue], (CGFloat)[request.arguments[@"y"] doubleValue]);
+    if (![element fb_forceTouchCoordinate:forceTouchPoint pressure:pressure duration:duration error:&error]) {
+      return FBResponseWithError(error);
+    }
+  } else {
+    if (![element fb_forceTouchWithPressure:pressure duration:duration error:&error]) {
+      return FBResponseWithError(error);
+    }
   }
   return FBResponseWithOK();
 }