Merge pull request #147 from ParsePlatform/nlutsenko.errors

Fixed error on network requests to Object APIs with 'error' column.

Author: nlutsenko

Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionJSONDataTaskDelegate.m

@@ -61,21 +61,25 @@ - (void)_taskDidFinish {
         return;
     }
 
-    if ([result isKindOfClass:[NSDictionary class]]) {
-        NSDictionary *resultDictionary = (NSDictionary *)result;
-        if (resultDictionary[@"error"]) {
-            NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionaryWithDictionary:resultDictionary];
-            errorDictionary[@"temporary"] = @(self.response.statusCode >= 500 || self.response.statusCode < 400);
-            self.error = [PFErrorUtilities errorFromResult:errorDictionary];
-            [super _taskDidFinish];
-            return;
+    if (self.response.statusCode >= 200) {
+        if (self.response.statusCode < 400) {
+            PFCommandResult *commandResult = [PFCommandResult commandResultWithResult:result
+                                                                         resultString:resultString
+                                                                         httpResponse:self.response];
+            self.result = commandResult;
+        } else if ([result isKindOfClass:[NSDictionary class]]) {
+            NSDictionary *resultDictionary = (NSDictionary *)result;
+            if (resultDictionary[@"error"]) {
+                NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionaryWithDictionary:resultDictionary];
+                errorDictionary[@"temporary"] = @(self.response.statusCode >= 500 || self.response.statusCode < 400);
+                self.error = [PFErrorUtilities errorFromResult:errorDictionary];
+            }
         }
     }
 
-    PFCommandResult *commandResult = [PFCommandResult commandResultWithResult:result
-                                                                 resultString:resultString
-                                                                 httpResponse:self.response];
-    self.result = commandResult;
+    if (!self.result && !self.error) {
+        self.error = [PFErrorUtilities errorWithCode:kPFErrorInternalServer message:resultString];
+    }
     [super _taskDidFinish];
 }
 

Tests/Unit/URLSessionDataTaskDelegateTests.m

@@ -70,11 +70,11 @@ - (void)testSuccess {
     NSData *chunkA = [@"{ \"foo\" :" dataUsingEncoding:NSUTF8StringEncoding];
     NSData *chunkB = [@" \"bar\" }" dataUsingEncoding:NSUTF8StringEncoding];
 
-    NSURLResponse *urlResponse = [[NSURLResponse alloc] initWithURL:[NSURL URLWithString:@"http://foo.bar"]
-                                                           MIMEType:@"application/json"
-                                              expectedContentLength:chunkA.length + chunkB.length
-                                                   textEncodingName:@"UTF-8"];
-
+    NSHTTPURLResponse *urlResponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:@"http://foo.bar"]
+                                                                 statusCode:200
+                                                                HTTPVersion:@"HTTP/1.1"
+                                                               headerFields:nil];
+    
     [delegate URLSession:mockedSession
                     task:mockedTask
          didSendBodyData:5