fix($http): JSON parse failure

Fixes angular#15695

Author: chirag64

docs/content/error/$http/baddata.ngdoc

@@ -3,14 +3,12 @@
 @fullName Bad JSON Data
 @description
 
-The default @{link ng$http#default-transformations `transformResponse`} will try to parse the
+The default @{link ng.$http#default-transformations `transformResponse`} will try to parse the
 response as JSON if the `Content-Type` header is `application/json` or the response looks like a
 valid JSON-stringified object or array.
 This error occurs when that data is not a valid JSON object.
 
 The error message should provide additional context such as the actual response.
 
-To resolve this error, make sure you pass a valid JSON data object to `transformResponse`.
-
-For more information, see the {@link ng$http#default-transformations `transformResponse`} service
-API documentation.
+To resolve this error, make sure you pass valid JSON data to `transformResponse` or use an
+appropriate `Content-Type` header for non-JSON data.

src/ng/http.js

@@ -142,7 +142,7 @@ function defaultHttpResponseTransform(data, headers) {
           data = fromJson(tempData);
         } catch (e) {
           throw $httpMinErr('baddata', 'Data must be a valid JSON object. Received: "{0}". ' +
-          'Error occurred: "{1}"', data, e);
+          'Parse error: "{1}"', data, e);
         }
       }
     }

test/ng/httpSpec.js

@@ -1446,12 +1446,12 @@ describe('$http', function() {
         it('should return JSON data with error message if JSON is invalid', function() {
           var errCallback = jasmine.createSpy('error');
           $httpBackend.expect('GET', '/url').respond('{abcd}', {'Content-Type': 'application/json'});
-            $http({method: 'GET', url: '/url'}).then(callback).catch(errCallback);
-            $httpBackend.flush();
+          $http.get('/url').then(callback).catch(errCallback);
+          $httpBackend.flush();
 
-            expect(callback).not.toHaveBeenCalled();
-            expect(errCallback).toHaveBeenCalledOnce();
-            expect(errCallback.calls.mostRecent().args[0]).toEqualMinErr('$http', 'baddata');
+          expect(callback).not.toHaveBeenCalled();
+          expect(errCallback).toHaveBeenCalledOnce();
+          expect(errCallback.calls.mostRecent().args[0]).toEqualMinErr('$http', 'baddata');
         });
       });
     });