Adding support for WKWebView

Author: jeromelebel

EarlGrey.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		02559E992147133F0087CD4F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02559E982147133F0087CD4F /* WebKit.framework */; };
 		3F38EF201F20269700EBDFFC /* GREYObjectDeallocationTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F38EF1E1F20269700EBDFFC /* GREYObjectDeallocationTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		3F38EF211F20269700EBDFFC /* GREYObjectDeallocationTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F38EF1F1F20269700EBDFFC /* GREYObjectDeallocationTracker.m */; };
 		3F5122141EE1D37E0000CC56 /* GREYTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F51220E1EE1D37E0000CC56 /* GREYTraversal.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -252,6 +253,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		02559E982147133F0087CD4F /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		3F38EF1E1F20269700EBDFFC /* GREYObjectDeallocationTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GREYObjectDeallocationTracker.h; sourceTree = "<group>"; };
 		3F38EF1F1F20269700EBDFFC /* GREYObjectDeallocationTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GREYObjectDeallocationTracker.m; sourceTree = "<group>"; };
 		3F51220E1EE1D37E0000CC56 /* GREYTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GREYTraversal.h; path = EarlGrey/Traversal/GREYTraversal.h; sourceTree = SOURCE_ROOT; };
@@ -497,6 +499,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				02559E992147133F0087CD4F /* WebKit.framework in Frameworks */,
 				61CBDE801D4CD85200206BF7 /* CoreData.framework in Frameworks */,
 				FD10025B1C5B473400B2DB0A /* OCHamcrest.framework in Frameworks */,
 				FD10025A1C5B472C00B2DB0A /* IOKit.framework in Frameworks */,
@@ -527,6 +530,7 @@
 		FD06C6751BECAE6A009032A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				02559E982147133F0087CD4F /* WebKit.framework */,
 				61CBDE7F1D4CD85200206BF7 /* CoreData.framework */,
 				FD1002591C5B472C00B2DB0A /* IOKit.framework */,
 				FD6160601BF2C97800722593 /* OCHamcrest.framework */,

EarlGrey/Action/GREYActions.h

@@ -368,13 +368,13 @@ NS_ASSUME_NONNULL_BEGIN
 + (id<GREYAction>)actionForSetPickerColumn:(NSInteger)column toValue:(NSString *)value;
 
 /**
- *  Returns an action that executes JavaScript against a UIWebView and sets the return value to
- *  @c outResult if provided.
+ *  Returns an action that executes JavaScript against a UIWebView or WKWebView and sets the return
+ *  value to @c outResult if provided.
  *
  *  @param js             The Javascript code to be executed.
  *  @param[out] outResult The result of the code execution.
  *
- *  @return A GREYAction that executes JavaScript code against a UIWebView.
+ *  @return A GREYAction that executes JavaScript code against a UIWebView or WKWebView.
  */
 + (id<GREYAction>)actionForJavaScriptExecution:(NSString *)js
                                         output:(__strong NSString *_Nullable *_Nullable)outResult;

EarlGrey/Action/GREYActions.m

@@ -16,6 +16,8 @@
 
 #import "Action/GREYActions.h"
 
+#import <WebKit/WebKit.h>
+
 #import "Action/GREYAction.h"
 #import "Action/GREYActionBlock.h"
 #import "Action/GREYChangeStepperAction.h"
@@ -48,6 +50,8 @@
 
 static Class gWebAccessibilityObjectWrapperClass;
 static Class gAccessibilityTextFieldElementClass;
+// Timeout for JavaScript execution using WKWebView.
+static const CFTimeInterval kJavaScriptTimeoutSeconds = 60;
 
 @implementation GREYActions
 
@@ -292,22 +296,46 @@ + (void)initialize {
 + (id<GREYAction>)actionForJavaScriptExecution:(NSString *)js
                                         output:(__strong NSString **)outResult {
   // TODO: JS Errors should be propagated up.
-  id<GREYMatcher> constraints = grey_allOf(grey_not(grey_systemAlertViewShown()),
-                                           grey_kindOfClass([UIWebView class]),
-                                           nil);
+  id<GREYMatcher> constraints =
+      grey_allOf(grey_not(grey_systemAlertViewShown()),
+                 grey_anyOf(grey_kindOfClass([UIWebView class]),
+                            grey_kindOfClass([WKWebView class]), nil),
+                 nil);
+  BOOL (^performBlock)(id webView, __strong NSError **errorOrNil) = ^(
+      id webView, __strong NSError **errorOrNil) {
+    if ([webView isKindOfClass:[WKWebView class]]) {
+      WKWebView *wkWebView = webView;
+      __block NSString *resultString = nil;
+      __block BOOL completionDone = NO;
+      [wkWebView evaluateJavaScript:js
+                  completionHandler:^(id result, NSError *error) {
+                    resultString = [result description];
+                    completionDone = YES;
+                  }];
+      NSDate *timeoutDate = [NSDate dateWithTimeIntervalSinceNow:kJavaScriptTimeoutSeconds];
+      while (!completionDone && timeoutDate.timeIntervalSinceNow > 0) {
+        [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
+      }
+      if (completionDone && outResult) {
+        *outResult = resultString;
+      }
+      return completionDone;
+    } else if ([webView isKindOfClass:[UIWebView class]]) {
+      UIWebView *uiWebView = webView;
+      if (outResult) {
+        *outResult = [uiWebView stringByEvaluatingJavaScriptFromString:js];
+      } else {
+        [uiWebView stringByEvaluatingJavaScriptFromString:js];
+      }
+      // TODO: Delay should be removed once webview sync is stable.
+      [[GREYUIThreadExecutor sharedInstance] drainForTime:0.5];  // Wait for actions to register.
+      return YES;
+    }
+    return NO;
+  };
   return [[GREYActionBlock alloc] initWithName:@"Execute JavaScript"
                                    constraints:constraints
-                                  performBlock:^BOOL (UIWebView *webView,
-                                                      __strong NSError **errorOrNil) {
-    if (outResult) {
-      *outResult = [webView stringByEvaluatingJavaScriptFromString:js];
-    } else {
-      [webView stringByEvaluatingJavaScriptFromString:js];
-    }
-    // TODO: Delay should be removed once webview sync is stable.
-    [[GREYUIThreadExecutor sharedInstance] drainForTime:0.5];  // Wait for actions to register.
-    return YES;
-  }];
+                                  performBlock:performBlock];
 }
 
 + (id<GREYAction>)actionForSnapshot:(__strong UIImage **)outImage {