Merge pull request #238 from percysnoodle/popover-window

Add a dimmingViewWindow property to UIApplication and use it in stepToDismissPopover

Author: efirestone

Additions/UIApplication-KIFAdditions.h

@@ -19,6 +19,7 @@
 
 - (UIWindow *)keyboardWindow;
 - (UIWindow *)pickerViewWindow;
+- (UIWindow *)dimmingViewWindow;
 - (NSArray *)windowsWithKeyWindow;
 
 @end

Additions/UIApplication-KIFAdditions.m

@@ -76,6 +76,18 @@ - (UIWindow *)pickerViewWindow;
     return nil;
 }
 
+- (UIWindow *)dimmingViewWindow;
+{
+    for (UIWindow *window in self.windowsWithKeyWindow) {
+        NSArray *dimmingViews = [window subviewsWithClassNameOrSuperClassNamePrefix:@"UIDimmingView"];
+        if (dimmingViews.count > 0) {
+            return window;
+        }
+    }
+    
+    return nil;
+}
+
 - (NSArray *)windowsWithKeyWindow
 {
     NSMutableArray *windows = self.windows.mutableCopy;

Classes/KIFTestStep.m

@@ -593,9 +593,9 @@ + (id)stepToDismissPopover;
 {
     return [self stepWithDescription:@"Dismiss the popover" executionBlock:^(KIFTestStep *step, NSError **error) {
         const NSTimeInterval tapDelay = 0.05;
-        NSArray *windows = [[UIApplication sharedApplication] windowsWithKeyWindow];
-        KIFTestCondition(windows.count, error, @"Failed to find any windows in the application");
-        UIView *dimmingView = [[[windows objectAtIndex:0] subviewsWithClassNamePrefix:@"UIDimmingView"] lastObject];
+        UIWindow *window = [[UIApplication sharedApplication] dimmingViewWindow];
+        KIFTestCondition(window, error, @"Failed to find any dimming views in the application");
+        UIView *dimmingView = [[window subviewsWithClassNamePrefix:@"UIDimmingView"] lastObject];
         [dimmingView tapAtPoint:CGPointMake(50.0f, 50.0f)];
         CFRunLoopRunInMode(kCFRunLoopDefaultMode, tapDelay, false);
         return KIFTestStepResultSuccess;