google · Oct 20, 2018 · Oct 31, 2018 · Dec 21, 2018 · Dec 22, 2018 · Mar 27, 2019
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 Details changes in each release of EarlGrey. EarlGrey follows [semantic versioning](http://semver.org/).
 
+## [1.16.0](https://github.com/google/EarlGrey/tree/1.16.0) (10/26/2019)
+```
+Baseline: [09f4abc]
++ [09f4abc]: Fix steppers
+```
+
+### Enhancements
+* Fixed runtime breakage on iOS 13.
+
+### Compatibility
+* EarlGrey has been tested for working till Xcode version 10.1 and Swift 5.
+
+## [1.15.1](https://github.com/google/EarlGrey/tree/1.15.1) (05/17/2019)
+```
+Baseline: [b15a131]
++ [b15a131]: Fix TrustKit swizzling issues in Earl Grey
+```
+
+### Bug Fixes
+* Accessibility fix added for device tests on 12.1.
+* Fix TrustKit swizzling with proxy delegates for NSURlSession.
+* Fixed Swift 5.0 wrappers.
+
+### Compatibility
+* EarlGrey has now been tested for working till Xcode version 10.1 and Swift 5.
+
 ## [1.15.0](https://github.com/google/EarlGrey/tree/1.15.0) (08/03/2018)
 ```
 Baseline: [59ce3b6c]

diff --git a/EarlGrey-Info.plist b/EarlGrey-Info.plist
@@ -13,9 +13,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.15.0</string>
+	<string>1.16.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.15.0</string>
+	<string>1.16.0</string>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
 	<key>license</key>
 	<string>
 

diff --git a/EarlGrey.podspec.json b/EarlGrey.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "EarlGrey",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "summary": "iOS UI Automation Test Framework",
   "description": "EarlGrey is a native iOS UI automation test framework that enables you to write clear, concise tests.\\n\\nWith the EarlGrey framework, you have access to enhanced synchronization features. EarlGrey automatically synchronizes with the UI, network requests, and various queues, but still allows you to manually implement customized timings, if needed.\\n\\nEarlGrey’s synchronization features help ensure that the UI is in a steady state before actions are performed. This greatly increases test stability and makes tests highly repeatable.\\n\\nEarlGrey works in conjunction with the XCTest framework and integrates with Xcode’s Test Navigator so you can run tests directly from Xcode or the command line (using xcodebuild).",
   "homepage": "http://google.github.io/EarlGrey",
@@ -16,7 +16,7 @@
   },
   "requires_arc": true,
   "source": {
-    "http": "https://www.github.com/google/EarlGrey/releases/download/1.15.0/EarlGrey.zip"
+    "http": "https://www.github.com/google/EarlGrey/releases/download/1.16.0/EarlGrey.zip"
   },
   "frameworks": [
     "CoreData",

diff --git a/EarlGrey.xcodeproj/project.pbxproj b/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 */,
@@ -1121,7 +1125,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd ${PROJECT_DIR}\n./Scripts/setup-earlgrey.sh";
+			shellScript = "cd \"${PROJECT_DIR}\"\n./Scripts/setup-earlgrey.sh\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/EarlGrey.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/EarlGrey.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/EarlGrey/Action/GREYActions+Internal.h b/EarlGrey/Action/GREYActions+Internal.h
@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  *  @return @c YES if the action succeeded, else @c NO. If an action returns @c NO, it does not
  *          mean that the action was not performed at all but somewhere during the action execution
- *          the error occured and so the UI may be in an unrecoverable state.
+ *          the error occurred and so the UI may be in an unrecoverable state.
  *
  *  @remark This is available only for internal testing purposes.
  */

diff --git a/EarlGrey/Action/GREYActions.h b/EarlGrey/Action/GREYActions.h
@@ -317,8 +317,8 @@ NS_ASSUME_NONNULL_BEGIN
  *
  *  @param text The text to be typed. For Objective-C, backspace is supported by using "\b" in the
  *              string and "\u{8}" in Swift strings. Return key is supported with "\n".
- *              For Example: @"Helpo\b\bloWorld" will type HelloWorld in Objective-C.
- *                           "Helpo\u{8}\u{8}loWorld" will type HelloWorld in Swift.
+ *              For Example: @code @"Helpo\b\bloWorld" @endcode will type HelloWorld in Objective-C.
+ *                           @code "Helpo\u{8}\u{8}loWorld" @endcode will type HelloWorld in Swift.
  *
  *  @return A GREYAction to type a specific text string in a text field.
  */
@@ -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;

diff --git a/EarlGrey/Action/GREYActions.m b/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
 
@@ -236,8 +240,12 @@ + (void)initialize {
                             performBlock:^BOOL (id element, __strong NSError **errorOrNil) {
     NSString *textStr;
     if ([element grey_isWebAccessibilityElement]) {
+#if !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
       [GREYActions grey_setText:@"" onWebElement:element];
       return YES;
+#else
+      return NO;
+#endif  // !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
     } else if ([element isKindOfClass:gAccessibilityTextFieldElementClass]) {
       element = [element textField];
     } else if ([element respondsToSelector:@selector(text)]) {
@@ -292,22 +300,54 @@ + (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()),
+#if !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
+                 grey_anyOf(
+                     grey_kindOfClass([UIWebView class]),
+                     grey_kindOfClass([WKWebView class]), nil),
+#else
+                 grey_kindOfClass([WKWebView class]),
+#endif  // !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
+                 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;
+    }
+#if !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
+    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;
+    }
+#endif  // !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
+    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 {
@@ -332,6 +372,7 @@ + (void)initialize {
 
 #pragma mark - Private
 
+#if !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
 /**
  *  Sets WebView input text value.
  *
@@ -360,6 +401,7 @@ + (void)grey_setText:(NSString *)text onWebElement:(id)element {
   UIWebView *parentWebView = (UIWebView *)[element grey_viewContainingSelf];
   [parentWebView stringByEvaluatingJavaScriptFromString:jsForTitle];
 }
+#endif  // !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
 
 /**
  *  Set the UITextField text value directly, bypassing the iOS keyboard.
@@ -368,7 +410,7 @@ + (void)grey_setText:(NSString *)text onWebElement:(id)element {
  *
  *  @return @c YES if the action succeeded, else @c NO. If an action returns @c NO, it does not
  *          mean that the action was not performed at all but somewhere during the action execution
- *          the error occured and so the UI may be in an unrecoverable state.
+ *          the error occurred and so the UI may be in an unrecoverable state.
  */
 + (id<GREYAction>)grey_actionForReplaceText:(NSString *)text {
   SEL setTextSelector = NSSelectorFromString(@"setText:");
@@ -382,7 +424,9 @@ + (void)grey_setText:(NSString *)text onWebElement:(id)element {
                              constraints:constraints
                             performBlock:^BOOL (id element, __strong NSError **errorOrNil) {
     if ([element grey_isWebAccessibilityElement]) {
+#if !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
       [GREYActions grey_setText:text onWebElement:element];
+#endif  // !defined(__IPHONE_12_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0
     } else {
       if ([element isKindOfClass:gAccessibilityTextFieldElementClass]) {
         element = [element textField];
@@ -446,7 +490,7 @@ + (void)grey_setText:(NSString *)text onWebElement:(id)element {
  *
  *  @return @c YES if the action succeeded, else @c NO. If an action returns @c NO, it does not
  *          mean that the action was not performed at all but somewhere during the action execution
- *          the error occured and so the UI may be in an unrecoverable state.
+ *          the error occurred and so the UI may be in an unrecoverable state.
  */
 + (BOOL)grey_disableAutoCorrectForDelegateAndTypeText:(NSString *)text
                                      inFirstResponder:(id)firstResponder