Merge from main master branch

KIF Tests/AccessibilityIdentifierPullToRefreshTests.m

@@ -37,4 +37,9 @@ -(void) testPullToRefreshByAccessibilityIdentifierWithDuration
 	[tester waitForAbsenceOfViewWithAccessibilityLabel:@"Bingo!"];
 }
 
+- (void)afterEach
+{
+    [tester waitForAnimationsToFinish];
+}
+
 @end

KIF Tests/AccessibilityIdentifierTests.m

@@ -17,6 +17,7 @@ @implementation AccessibilityIdentifierTests
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [tester tapViewWithAccessibilityLabel:@"Tapping"];
 }
 

KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m

@@ -17,6 +17,7 @@ @implementation AccessibilityIdentifierTests_ViewTestActor
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [[viewTester usingLabel:@"Tapping"] tap];
 }
 

KIF Tests/GestureTests.m

@@ -193,6 +193,34 @@ - (void)testSwipingDownWithIdentifier
     [tester waitForViewWithAccessibilityLabel:@"Down"];
 }
 
+- (void)testSwipingFromScreenEdgeLeft
+{
+    UIView *view = [tester waitForViewWithAccessibilityIdentifier:@"gestures.swipeMe"];
+    CGSize windowSize = view.window.bounds.size;
+    CGPoint point = CGPointMake(0.5, 200);
+    point = [view convertPoint:point fromView:view.window];
+    KIFDisplacement displacement = CGPointMake(windowSize.width * 0.5, 5);
+    [view dragFromPoint:point displacement:displacement steps:20];
+    [tester waitForAbsenceOfViewWithAccessibilityLabel:@"LeftEdge"];
+
+    [tester swipeFromEdge:UIRectEdgeLeft];
+    [tester waitForViewWithAccessibilityLabel:@"LeftEdge"];
+}
+
+- (void)testSwipingFromScreenEdgeRight
+{
+    UIView *view = [tester waitForViewWithAccessibilityIdentifier:@"gestures.swipeMe"];
+    CGSize windowSize = view.window.bounds.size;
+    CGPoint point = CGPointMake(windowSize.width - 0.5, 200);
+    point = [view convertPoint:point fromView:view.window];
+    KIFDisplacement displacement = CGPointMake(-windowSize.width * 0.5, 5);
+    [view dragFromPoint:point displacement:displacement steps:20];
+    [tester waitForAbsenceOfViewWithAccessibilityLabel:@"RightEdge"];
+
+    [tester swipeFromEdge:UIRectEdgeRight];
+    [tester waitForViewWithAccessibilityLabel:@"RightEdge"];
+}
+
 - (void)testScrolling
 {
     // Needs to be offset from the edge to prevent the navigation controller's interactivePopGestureRecognizer from triggering

KIF Tests/GestureTests_ViewTestActor.m

@@ -108,4 +108,16 @@ - (void)testMissingScrollableElement
     KIFExpectFailure([[[viewTester usingTimeout:0.25] usingIdentifier:@"Unknown"] scrollByFractionOfSizeHorizontal:0.5 vertical:0.5]);
 }
 
+- (void)testSwipingFromScreenEdgeLeft
+{
+    [viewTester swipeFromEdge:UIRectEdgeLeft];
+    [[viewTester usingLabel:@"LeftEdge"] waitForView];
+}
+
+- (void)testSwipingFromScreenEdgeRight
+{
+    [viewTester swipeFromEdge:UIRectEdgeRight];
+    [[viewTester usingLabel:@"RightEdge"] waitForView];
+}
+
 @end

KIF Tests/LongPressTests.m

@@ -15,6 +15,7 @@ @implementation LongPressTests
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [tester tapViewWithAccessibilityLabel:@"Tapping"];
 }
 

KIF Tests/LongPressTests_ViewTestActor.m

@@ -16,6 +16,7 @@ @implementation LongPressTests_ViewTestActor
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [[viewTester usingLabel:@"Tapping"] tap];
 }
 

KIF Tests/ModalViewTests.m

@@ -31,8 +31,8 @@ - (void)testInteractionWithAnAlertView
 
 - (void)testInteractionWithAnActionSheet
 {
-    [tester tapViewWithAccessibilityLabel:@"UIActionSheet"];
-    [tester waitForViewWithAccessibilityLabel:@"Action Sheet"];
+    [tester tapViewWithAccessibilityLabel:@"UIAlertController"];
+    [tester waitForViewWithAccessibilityLabel:@"Alert Controller"];
     [tester waitForTappableViewWithAccessibilityLabel:@"Destroy"];
     [tester waitForTappableViewWithAccessibilityLabel:@"A"];
     [tester waitForTappableViewWithAccessibilityLabel:@"B"];

KIF Tests/ModalViewTests_ViewTestActor.m

@@ -31,8 +31,8 @@ - (void)testInteractionWithAnAlertView
 
 - (void)testInteractionWithAnActionSheet
 {
-    [[viewTester usingLabel:@"UIActionSheet"] tap];
-    [[viewTester usingLabel:@"Action Sheet"] waitForView];
+    [[viewTester usingLabel:@"UIAlertController"] tap];
+    [[viewTester usingLabel:@"Alert Controller"] waitForView];
     [[viewTester usingLabel:@"Destroy"] waitForTappableView];
     [[viewTester usingLabel:@"A"] waitForTappableView];
     [[viewTester usingLabel:@"B"] waitForTappableView];

KIF Tests/SystemTests.m

@@ -63,48 +63,6 @@ - (void)testMemoryWarningSimulator
 }
 
 - (void)testMockingOpenURL
-{
-    __block BOOL openURLReturnValue;
-    __block BOOL canOpenURLReturnValue;
-    [system waitForApplicationToOpenURL:@"test123://" whileExecutingBlock:^{
-        NSURL *uninstalledAppURL = [NSURL URLWithString:@"test123://"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:uninstalledAppURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:uninstalledAppURL];
-    } returning:NO];
-    KIFAssertEqual(NO, openURLReturnValue, @"openURL: should have returned NO");
-    KIFAssertEqual(NO, canOpenURLReturnValue, @"canOpenURL: should have returned NO");
-
-    [system waitForApplicationToOpenURL:@"test123://" whileExecutingBlock:^{
-        NSURL *installedAppURL = [NSURL URLWithString:@"test123://"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:installedAppURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:installedAppURL];
-    } returning:YES];
-    KIFAssertEqual(YES, openURLReturnValue, @"openURL: should have returned YES");
-    KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES");
-
-    [system waitForApplicationToOpenURLWithScheme:@"test123" whileExecutingBlock:^{
-        NSURL *installedAppURL = [NSURL URLWithString:@"test123://some/path?query"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:installedAppURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:installedAppURL];
-    } returning:YES];
-    KIFAssertEqual(YES, openURLReturnValue, @"openURL: should have returned YES");
-    KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES");
-
-    [system waitForApplicationToOpenAnyURLWhileExecutingBlock:^{
-        NSURL *someURL = [NSURL URLWithString:@"423543523454://"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:someURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:someURL];
-    } returning:YES];
-    KIFAssertEqual(YES, openURLReturnValue, @"openURL: should have returned YES");
-    KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES");
-
-    NSURL *fakeURL = [NSURL URLWithString:@"this-is-a-fake-url://"];
-    KIFAssertFalse([[UIApplication sharedApplication] canOpenURL:fakeURL], @"Should no longer be mocking, reject bad URL.");
-    KIFAssertFalse([[UIApplication sharedApplication] openURL:fakeURL], @"Should no longer be mocking, reject bad URL.");
-}
-
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
-- (void)testMockingOpenURLiOS10xAndUp
 {
     __block BOOL canOpenURLReturnValue;
     [system waitForApplicationToOpenURL:@"test123://" whileExecutingBlock:^{
@@ -138,6 +96,5 @@ - (void)testMockingOpenURLiOS10xAndUp
     NSURL *fakeURL = [NSURL URLWithString:@"this-is-a-fake-url://"];
     KIFAssertFalse([[UIApplication sharedApplication] canOpenURL:fakeURL], @"Should no longer be mocking, reject bad URL.");
 }
-#endif
 
 @end

KIF Tests/TypingTests.m

@@ -16,6 +16,7 @@ @implementation TypingTests
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [tester tapViewWithAccessibilityLabel:@"Tapping"];
 }
 

KIF Tests/TypingTests_ViewTestActor.m

@@ -17,6 +17,7 @@ @implementation TypingTests_ViewTestActor
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [[viewTester usingLabel:@"Tapping"] tap];
 }
 

KIF.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name                    = "KIF"
-  s.version                 = "3.8.9"
+  s.version                 = "3.9.0"
   s.summary                 = "Keep It Functional - iOS UI acceptance testing in an XCUnit harness."
   s.homepage                = "https://github.com/kif-framework/KIF/"
   s.license                 = 'Apache 2.0'
   s.authors                 = 'Michael Thole', 'Eric Firestone', 'Jim Puls', 'Brian Nickel'
   s.source                  = { :git => "https://github.com/kif-framework/KIF.git", :tag => "v#{ s.version.to_s }" }
-  s.platform                = :ios, '10.0'
+  s.platform                = :ios, '11.0'
   s.frameworks              = 'CoreGraphics', 'QuartzCore', 'IOKit', 'WebKit', 'XCTest'
   s.default_subspec         = 'Core'
   s.requires_arc            = true

KIF.xcodeproj/project.pbxproj

@@ -1789,7 +1789,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SDKROOT = iphoneos;
@@ -1834,7 +1834,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -2097,7 +2097,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;

Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "KIF",
     platforms: [
-        .iOS(.v9)
+        .iOS(.v11)
     ],
     products: [
         .library(

Sources/KIF/Additions/UIApplication-KIFAdditions.m

@@ -178,14 +178,22 @@ - (BOOL)writeScreenshotForLine:(NSUInteger)lineNumber inFile:(NSString *)filenam
         }
         return NO;
     }
-
+
+    UIWindow *keyboardWindow = [self keyboardWindow];
+
     UIGraphicsBeginImageContextWithOptions([[windows objectAtIndex:0] bounds].size, YES, 0);
     for (UIWindow *window in windows) {
 		//avoid https://github.com/kif-framework/KIF/issues/679
 		if (window.hidden) {
 			continue;
 		}
 
+        if (@available(iOS 17.0, *)) {
+            if (window == keyboardWindow) {
+                continue;
+            }
+        }
+
         if ([window respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {
             [window drawViewHierarchyInRect:window.bounds afterScreenUpdates:YES];
         } else {

Sources/KIF/Additions/UITouch-KIFAdditions.h

@@ -17,5 +17,6 @@
 
 - (void)setLocationInWindow:(CGPoint)location;
 - (void)setPhaseAndUpdateTimestamp:(UITouchPhase)phase;
+- (void)setIsFromEdge:(BOOL)isFromEdge;
 
 @end

Sources/KIF/Additions/UITouch-KIFAdditions.m

@@ -37,6 +37,7 @@ - (void)_setIsFirstTouchForView:(BOOL)firstTouchForView;
 - (void)_setIsTapToClick:(BOOL)tapToClick;
 
 - (void)_setHidEvent:(IOHIDEventRef)event;
+- (void)_setEdgeType:(NSInteger)edgeType;
 
 @end
 
@@ -117,6 +118,12 @@ - (void)setPhaseAndUpdateTimestamp:(UITouchPhase)phase
     [self setPhase:phase];
 }
 
+- (void)setIsFromEdge:(BOOL)isFromEdge
+{
+    NSInteger edgeType = isFromEdge ? 4 : 0;
+    [self _setEdgeType:edgeType];
+}
+
 - (void)kif_setHidEvent {
     IOHIDEventRef event = kif_IOHIDEventWithTouches(@[self]);
     [self _setHidEvent:event];

Sources/KIF/Additions/UIView-KIFAdditions.h

@@ -53,6 +53,7 @@ typedef CGPoint KIFDisplacement;
 - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint;
 - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint steps:(NSUInteger)stepCount;
 - (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount;
+- (void)dragFromEdge:(UIRectEdge)startEdge toEdge:(UIRectEdge)endEdge;
 - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
 - (void)twoFingerPanFromPoint:(CGPoint)startPoint toPoint:(CGPoint)toPoint steps:(NSUInteger)stepCount;
 - (void)pinchAtPoint:(CGPoint)centerPoint distance:(CGFloat)distance steps:(NSUInteger)stepCount;

Sources/KIF/Additions/UIView-KIFAdditions.m

@@ -636,6 +636,27 @@ - (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displace
     [self dragPointsAlongPaths:@[path]];
 }
 
+- (void)dragFromEdge:(UIRectEdge)startEdge toEdge:(UIRectEdge)endEdge
+{
+    CGFloat width = self.bounds.size.width;
+    CGFloat height = self.bounds.size.height;
+    CGFloat edgeInset = 0.5;
+    NSDictionary *edgeToPoint = @{
+        @(UIRectEdgeTop): @(CGPointMake(width / 2, edgeInset)),
+        @(UIRectEdgeLeft): @(CGPointMake(edgeInset, height / 2)),
+        @(UIRectEdgeBottom): @(CGPointMake(width / 2, height - edgeInset)),
+        @(UIRectEdgeRight): @(CGPointMake(width - edgeInset, height / 2)),
+    };
+    CGPoint startPoint = [edgeToPoint[@(startEdge)] CGPointValue];
+    CGPoint endPoint = [edgeToPoint[@(endEdge)] CGPointValue];
+
+    CGPoint screenPoint = [self convertPoint:startPoint toView:self.window];
+    BOOL isFromScreenEdge = (screenPoint.x < 1 || screenPoint.x > self.window.bounds.size.width - 1);
+
+    NSArray<NSValue *> *path = [self pointsFromStartPoint:startPoint toPoint:endPoint steps:20];
+    [self dragPointsAlongPaths:@[path] isFromEdge:isFromScreenEdge];
+}
+
 - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
 {
     // convert point array into NSArray with NSValue
@@ -648,6 +669,10 @@ - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
 }
 
 - (void)dragPointsAlongPaths:(NSArray<NSArray<NSValue *> *> *)arrayOfPaths {
+    [self dragPointsAlongPaths:arrayOfPaths isFromEdge:NO];
+}
+
+- (void)dragPointsAlongPaths:(NSArray<NSArray<NSValue *> *> *)arrayOfPaths isFromEdge:(BOOL)isFromEdge {
     // There must be at least one path with at least one point
     if (arrayOfPaths.count == 0 || arrayOfPaths.firstObject.count == 0)
     {
@@ -692,6 +717,7 @@ - (void)dragPointsAlongPaths:(NSArray<NSArray<NSValue *> *> *)arrayOfPaths {
                 point = [self convertPoint:point fromView:self.window];
                 UITouch *touch = [[UITouch alloc] initAtPoint:point inView:self];
                 [touch setPhaseAndUpdateTimestamp:UITouchPhaseBegan];
+                [touch setIsFromEdge:isFromEdge];
                 [touches addObject:touch];
             }
             UIEvent *eventDown = [self eventWithTouches:[NSArray arrayWithArray:touches]];

Sources/KIF/Classes/KIFUITestActor.h

@@ -322,6 +322,12 @@ typedef NS_ENUM(NSUInteger, KIFPullToRefreshTiming) {
  */
 - (void)tapScreenAtPoint:(CGPoint)screenPoint;
 
+/*!
+ @abstract Performs a swipe gesture starting from the specified edge of the screen.
+ @param edge The edge from which the swipe gesture should start.
+ */
+- (void)swipeFromEdge:(UIRectEdge)edge;
+
 /*!
  @abstract Performs a long press on a particular view in the view hierarchy.
  @discussion The view or accessibility element with the given label is searched for in the view hierarchy. If the element isn't found or isn't currently tappable, then the step will attempt to wait until it is. Once the view is present and tappable, touch events are simulated in the center of the view or element.