finishing tests, fixing issues

Author: AleksandrRogov

lib/helpers/ErrorHelper.js

@@ -171,7 +171,8 @@ var ErrorHelper = {
 
     batchIncompatible: function (functionName, isBatch) {
         if (isBatch) {
-            throw new Error(functionName + " cannot be used in a BATCH request");
+            isBatch = false;
+            throw new Error(functionName + " cannot be used in a BATCH request.");
         }
     },
 

lib/requests/helpers/parseResponse.js

@@ -140,14 +140,27 @@ function parseBatchResponse(response, parseParams, requestNumber) {
             var responseData = batchResponse.substring(batchResponse.indexOf("{"), batchResponse.lastIndexOf("}") + 1);
 
             if (!responseData) {
-                var entityUrl = /OData-EntityId.+/i.exec(batchResponse);
+                if (/Content-Type: text\/plain/i.test(batchResponse)) {
+                    var plainContentReg = /\w+$/gi.exec(batchResponse.trim());
+                    var plainContent = plainContentReg && plainContentReg.length ? plainContentReg[0] : undefined;
 
-                if (entityUrl && entityUrl.length) {
-                    result.push(/([0-9A-F]{8}[-]?([0-9A-F]{4}[-]?){3}[0-9A-F]{12})\)$/i.exec(entityUrl[0])[1]);
-                }
-                else if (parseParams[i].hasOwnProperty('valueIfEmpty')) {
-                    result.push(parseParams[i].valueIfEmpty);
+                    //check if a plain content is a number or not
+                    result.push(isNaN(plainContent) ? plainContent : parseInt(plainContent));
                 }
+                else
+                    if (parseParams[requestNumber].hasOwnProperty('valueIfEmpty')) {
+                        result.push(parseParams[requestNumber].valueIfEmpty);
+                    }
+                    else {
+                        var entityUrl = /OData-EntityId.+/i.exec(batchResponse);
+
+                        if (entityUrl && entityUrl.length) {
+                            result.push(/([0-9A-F]{8}[-]?([0-9A-F]{4}[-]?){3}[0-9A-F]{12})\)$/i.exec(entityUrl[0])[1]);
+                        }
+                        else {
+                            result.push(undefined);
+                        }
+                    }
             }
             else {
                 result.push(parseData(JSON.parse(responseData, dateReviver), parseParams[requestNumber]));
@@ -182,16 +195,17 @@ module.exports = function parseResponse(response, responseHeaders, parseParams)
         }
     }
     else {
-        if (responseHeaders['OData-EntityId'] || responseHeaders['odata-entityid']) {
-            var entityUrl = responseHeaders['OData-EntityId']
-                ? responseHeaders['OData-EntityId']
-                : responseHeaders['odata-entityid'];
-
-            parseResult = /([0-9A-F]{8}[-]?([0-9A-F]{4}[-]?){3}[0-9A-F]{12})\)$/i.exec(entityUrl)[1];
-        }
-        else if (parseParams.length && parseParams[0].hasOwnProperty('valueIfEmpty')) {
+        if (parseParams.length && parseParams[0].hasOwnProperty('valueIfEmpty')) {
             parseResult = parseParams[0].valueIfEmpty;
         }
+        else
+            if (responseHeaders['OData-EntityId'] || responseHeaders['odata-entityid']) {
+                var entityUrl = responseHeaders['OData-EntityId']
+                    ? responseHeaders['OData-EntityId']
+                    : responseHeaders['odata-entityid'];
+
+                parseResult = /([0-9A-F]{8}[-]?([0-9A-F]{4}[-]?){3}[0-9A-F]{12})\)$/i.exec(entityUrl)[1];
+            }
     }
 
     return parseResult;

lib/utilities/BatchConverter.js

@@ -51,7 +51,6 @@ var convertToBatch = function (requests) {
         }
         else {
             batchBody.push('Content-Type: application/json');
-            batchBody.push('\n' + request.data);
         }
 
         for (var key in request.headers) {
@@ -60,6 +59,10 @@ var convertToBatch = function (requests) {
 
             batchBody.push(key + ': ' + request.headers[key]);
         }
+
+        if (!isGet && request.data && request.data.length) {
+            batchBody.push('\n' + request.data);
+        }
     }
 
     if (currentChangeSet) {