Merge pull request #447 from xing/overrelease_fix

Fixes issue with overreleased objects

Author: phatmann

Classes/KIFTestActor.m

@@ -84,21 +84,19 @@ - (BOOL)tryRunningBlock:(KIFTestExecutionBlock)executionBlock complete:(KIFTestC
     KIFTestStepResult result;
     NSError *internalError;
 
-    @autoreleasepool {
-        while ((result = executionBlock(&internalError)) == KIFTestStepResultWait && -[startDate timeIntervalSinceNow] < timeout) {
-            CFRunLoopRunInMode([[UIApplication sharedApplication] currentRunLoopMode] ?: kCFRunLoopDefaultMode, KIFTestStepDelay, false);
-        }
-        
-        if (result == KIFTestStepResultWait) {
-            internalError = [NSError KIFErrorWithUnderlyingError:internalError format:@"The step timed out after %.2f seconds: %@", timeout, internalError.localizedDescription];
-            result = KIFTestStepResultFailure;
-        }
-        
-        if (completionBlock) {
-            completionBlock(result, internalError);
-        }
+    while ((result = executionBlock(&internalError)) == KIFTestStepResultWait && -[startDate timeIntervalSinceNow] < timeout) {
+        CFRunLoopRunInMode([[UIApplication sharedApplication] currentRunLoopMode] ?: kCFRunLoopDefaultMode, KIFTestStepDelay, false);
     }
-    
+
+    if (result == KIFTestStepResultWait) {
+        internalError = [NSError KIFErrorWithUnderlyingError:internalError format:@"The step timed out after %.2f seconds: %@", timeout, internalError.localizedDescription];
+        result = KIFTestStepResultFailure;
+    }
+
+    if (completionBlock) {
+        completionBlock(result, internalError);
+    }
+
     if (error) {
         *error = internalError;
     }

Classes/KIFUITestActor.m

@@ -59,7 +59,10 @@ - (UIView *)waitForTappableViewWithAccessibilityLabel:(NSString *)label value:(N
 - (UIView *)waitForViewWithAccessibilityLabel:(NSString *)label value:(NSString *)value traits:(UIAccessibilityTraits)traits tappable:(BOOL)mustBeTappable
 {
     UIView *view = nil;
-    [self waitForAccessibilityElement:NULL view:&view withLabel:label value:value traits:traits tappable:mustBeTappable];
+    @autoreleasepool {
+        [self waitForAccessibilityElement:NULL view:&view withLabel:label value:value traits:traits tappable:mustBeTappable];
+    }
+    
     return view;
 }
 
@@ -132,11 +135,12 @@ - (void)tapViewWithAccessibilityLabel:(NSString *)label traits:(UIAccessibilityT
 
 - (void)tapViewWithAccessibilityLabel:(NSString *)label value:(NSString *)value traits:(UIAccessibilityTraits)traits
 {
-    UIView *view = nil;
-    UIAccessibilityElement *element = nil;
-    
-    [self waitForAccessibilityElement:&element view:&view withLabel:label value:value traits:traits tappable:YES];
-    [self tapAccessibilityElement:element inView:view];
+    @autoreleasepool {
+        UIView *view = nil;
+        UIAccessibilityElement *element = nil;
+        [self waitForAccessibilityElement:&element view:&view withLabel:label value:value traits:traits tappable:YES];
+        [self tapAccessibilityElement:element inView:view];
+    }
 }
 
 - (void)tapAccessibilityElement:(UIAccessibilityElement *)element inView:(UIView *)view
@@ -206,11 +210,12 @@ - (void)longPressViewWithAccessibilityLabel:(NSString *)label value:(NSString *)
 
 - (void)longPressViewWithAccessibilityLabel:(NSString *)label value:(NSString *)value traits:(UIAccessibilityTraits)traits duration:(NSTimeInterval)duration;
 {
-    UIView *view = nil;
-    UIAccessibilityElement *element = nil;
-    
-    [self waitForAccessibilityElement:&element view:&view withLabel:label value:value traits:traits tappable:YES];
-    [self longPressAccessibilityElement:element inView:view duration:duration];
+    @autoreleasepool {
+        UIView *view = nil;
+        UIAccessibilityElement *element = nil;
+        [self waitForAccessibilityElement:&element view:&view withLabel:label value:value traits:traits tappable:YES];
+        [self longPressAccessibilityElement:element inView:view duration:duration];
+    }
 }
 
 - (void)longPressAccessibilityElement:(UIAccessibilityElement *)element inView:(UIView *)view duration:(NSTimeInterval)duration;