Merge FB master

Author: imurchie

Inspector/.eslintrc

@@ -251,7 +251,6 @@
 
     "flowtype/define-flow-type": 1,
     "flowtype/use-flow-type": 1,
-    "flowtype/object-type-delimiter": [1, "comma"],
 
   // React Plugin
   // The following rules are made available via `eslint-plugin-react`.

Inspector/css/app.css

@@ -6,8 +6,9 @@
  * 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.
  */
- 
+
 html, body, #app {
+  font-family: sans-serif;
   width: 100%;
   height: 100%;
   margin: 0px;
@@ -35,7 +36,7 @@ html, body, #app {
 }
 
 .section-caption {
-  display: block;  
+  display: block;
   text-align: center;
   padding: 20px;
   font-size: 200%;

Inspector/css/inspector.css

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-.inspector-field {  
+.inspector-field {
   margin-bottom: 5px;
 }
 
@@ -16,4 +16,5 @@
 }
 
 .inspector-field-value {
+  font-family: monospace;
 }

Inspector/css/tree.css

@@ -21,6 +21,7 @@
 }
 
 .tree-node {
+  font-family: monospace;
   cursor: pointer;
 }
 

PrivateHeaders/XCTest/XCUIScreen.h

@@ -0,0 +1,25 @@
+//
+//     Generated by class-dump 3.5 (64 bit) (Debug version compiled Nov 29 2017 14:55:25).
+//
+//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2015 by Steve Nygard.
+//
+
+@interface XCUIScreen()
+{
+    _Bool _isMainScreen;
+    int _displayID;
+}
+@property(readonly) _Bool isMainScreen; // @synthesize isMainScreen=_isMainScreen;
+@property(readonly) int displayID; // @synthesize displayID=_displayID;
+
+- (id)_clippedScreenshotData:(id)arg1 quality:(long long)arg2 rect:(struct CGRect)arg3 scale:(double)arg4;
+- (id)_screenshotDataForQuality:(long long)arg1 rect:(struct CGRect)arg2 error:(id *)arg3;
+- (id)screenshotDataForQuality:(long long)arg1 rect:(struct CGRect)arg2 error:(id *)arg3;
+- (id)screenshotDataForQuality:(long long)arg1 rect:(struct CGRect)arg2;
+- (id)_modernScreenshotDataForQuality:(long long)arg1 rect:(struct CGRect)arg2 error:(id *)arg3;
+- (id)screenshot;
+- (id)_imageFromData:(id)arg1;
+- (double)scale;
+- (id)initWithDisplayID:(int)arg1 isMainScreen:(_Bool)arg2;
+
+@end

WebDriverAgent.xcodeproj/project.pbxproj

@@ -724,6 +724,7 @@
 		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; };
+		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>"; };
 		EEDFE1201D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCUIDevice+FBHealthCheck.m"; sourceTree = "<group>"; };
@@ -1321,6 +1322,7 @@
 				EE35AD051E3B77D600A02D78 /* XCUIRecorderNodeFinderMatch.h */,
 				EE35AD061E3B77D600A02D78 /* XCUIRecorderTimingMessage.h */,
 				EE35AD071E3B77D600A02D78 /* XCUIRecorderUtilities.h */,
+				EED404361FCF02AB00D08020 /* XCUIScreen.h */,
 			);
 			path = XCTest;
 			sourceTree = "<group>";

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -20,6 +20,7 @@
 
 #import "FBMacros.h"
 #import "XCAXClient_iOS.h"
+#import "XCUIScreen.h"
 
 static const NSTimeInterval FBHomeButtonCoolOffTime = 1.;
 
@@ -42,8 +43,8 @@ - (BOOL)fb_goToHomescreenWithError:(NSError **)error
 
 - (NSData *)fb_screenshotWithError:(NSError*__autoreleasing*)error
 {
-  id xcScreen = NSClassFromString(@"XCUIScreen");
-  if (nil == xcScreen) {
+  Class xcScreenClass = NSClassFromString(@"XCUIScreen");
+  if (nil == xcScreenClass) {
     NSData *result = [[XCAXClient_iOS sharedClient] screenshotData];
     if (nil == result) {
       if (error) {
@@ -53,29 +54,20 @@ - (NSData *)fb_screenshotWithError:(NSError*__autoreleasing*)error
     }
     return result;
   }
-  
-  id mainScreen = [xcScreen valueForKey:@"mainScreen"];
-  XCUIApplication *app = FBApplication.fb_activeApplication;
-  CGSize screenSize = FBAdjustDimensionsForApplication(app.frame.size, app.interfaceOrientation);
-  SEL mSelector = NSSelectorFromString(@"screenshotDataForQuality:rect:error:");
-  NSMethodSignature *mSignature = [mainScreen methodSignatureForSelector:mSelector];
-  NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:mSignature];
-  [invocation setTarget:mainScreen];
-  [invocation setSelector:mSelector];
+
   // https://developer.apple.com/documentation/xctest/xctimagequality?language=objc
   // Select lower quality, since XCTest crashes randomly if the maximum quality (zero value) is selected
   // and the resulting screenshot does not fit the memory buffer preallocated for it by the operating system
+  CGSize screenSize = FBAdjustDimensionsForApplication(FBApplication.fb_activeApplication.frame.size, (UIInterfaceOrientation)[self.class sharedDevice].orientation);
   NSUInteger quality = 1;
-  [invocation setArgument:&quality atIndex:2];
   CGRect screenRect = CGRectMake(0, 0, screenSize.width, screenSize.height);
-  [invocation setArgument:&screenRect atIndex:3];
-  [invocation setArgument:&error atIndex:4];
-  [invocation invoke];
-  NSData __unsafe_unretained *result;
-  [invocation getReturnValue:&result];
+
+  XCUIScreen *mainScreen = (XCUIScreen *)[xcScreenClass mainScreen];
+  NSData *result = [mainScreen screenshotDataForQuality:quality rect:screenRect error:error];
   if (nil == result) {
     return nil;
   }
+
   // The resulting data is a JPEG image, so we need to convert it to PNG representation
   UIImage *image = [UIImage imageWithData:result];
   return (NSData *)UIImagePNGRepresentation(image);

WebDriverAgentLib/Utilities/FBConfiguration.h

@@ -27,6 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
 /*! Disables remote query evaluation making Xcode 9.x tests behave same as Xcode 8.x test */
 + (void)disableRemoteQueryEvaluation;
 
+/*! Disables attribute key path analysis, which will cause XCTest on Xcode 9.x to ignore some elements */
++ (void)disableAttributeKeyPathAnalysis;
+
 /* The maximum typing frequency for all typing activities */
 + (void)setMaxTypingFrequency:(NSUInteger)value;
 + (NSUInteger)maxTypingFrequency;

WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -31,6 +31,11 @@ + (void)disableRemoteQueryEvaluation
   [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"XCTDisableRemoteQueryEvaluation"];
 }
 
++ (void)disableAttributeKeyPathAnalysis
+{
+  [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"XCTDisableAttributeKeyPathAnalysis"];
+}
+
 + (NSRange)bindingPortRange
 {
   // 'WebDriverAgent --port 8080' can be passed via the arguments to the process

WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -33,6 +33,7 @@ - (void)setUp
 {
   [super setUp];
   [FBConfiguration disableRemoteQueryEvaluation];
+  [FBConfiguration disableAttributeKeyPathAnalysis];
   self.continueAfterFailure = NO;
   self.springboard = [FBSpringboardApplication fb_springboard];
   self.testedApplication = [XCUIApplication new];