Merge pull request #79 from ParsePlatform/nlutsenko.alertViewButtons

Fixed PFAlertView cancel button handling logic.

Author: nlutsenko

Parse/Internal/PFAlertView.m

@@ -35,8 +35,12 @@ + (void)showAlertWithTitle:(NSString *)title
 
         void (^alertActionHandler)(UIAlertAction *) = [^(UIAlertAction *action){
             // This block intentionally retains alertController, and releases it afterwards.
-            NSUInteger index = [alertController.actions indexOfObject:action];
-            completion(index - 1);
+            if (action.style == UIAlertActionStyleCancel) {
+                completion(NSNotFound);
+            } else {
+                NSUInteger index = [alertController.actions indexOfObject:action];
+                completion(index - 1);
+            }
             alertController = nil;
         } copy];
 
@@ -85,7 +89,11 @@ + (void)showAlertWithTitle:(NSString *)title
 
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
     if (self.completion) {
-        self.completion(buttonIndex - alertView.firstOtherButtonIndex);
+        if (buttonIndex == alertView.cancelButtonIndex) {
+            self.completion(NSNotFound);
+        } else {
+            self.completion(buttonIndex - 1);
+        }
     }
 }
 

Tests/Unit/AlertViewTests.m

@@ -102,7 +102,7 @@ - (void)testShowAlertWithAlertViewController {
                   cancelButtonTitle:@"Cancel"
                   otherButtonTitles:@[ @"Yes", @"No" ]
                          completion:^(NSUInteger selectedOtherButtonIndex) {
-                             XCTAssertEqual(selectedOtherButtonIndex, -1);
+                             XCTAssertEqual(selectedOtherButtonIndex, NSNotFound);
 
                              [expectation fulfill];
                          }];
@@ -147,15 +147,15 @@ - (void)testShowWithoutAlertViewController {
             [delegate alertView:self clickedButtonAtIndex:0];
         });
 
-        OCMStub([mockedAlertView firstOtherButtonIndex]).andReturn(1);
+        OCMStub([mockedAlertView cancelButtonIndex]).andReturn(0);
 
         XCTestExpectation *expectation = [self currentSelectorTestExpectation];
         [PFAlertView showAlertWithTitle:@"Title"
                                 message:@"Message"
                       cancelButtonTitle:@"Cancel"
                       otherButtonTitles:@[ @"Yes", @"No" ]
                              completion:^(NSUInteger selectedOtherButtonIndex) {
-                                 XCTAssertEqual(selectedOtherButtonIndex, -1);
+                                 XCTAssertEqual(selectedOtherButtonIndex, NSNotFound);
 
                                  [expectation fulfill];
                              }];