fix parse formatted values for expand objects

Author: AleksandrRogov

lib/requests/helpers/parseResponse.js

@@ -65,11 +65,16 @@ function parseData(object, parseParams) {
     for (var i = 0; i < keys.length; i++) {
         var currentKey = keys[i];
 
-        if (object[currentKey] != null && object[currentKey].constructor === Array) {
-            for (var j = 0; j < object[currentKey].length; j++) {
-                object[currentKey][j] = parseData(object[currentKey][j]);
-            }
-        }
+		if (object[currentKey] != null) {
+			if (object[currentKey].constructor === Array) {
+				for (var j = 0; j < object[currentKey].length; j++) {
+					object[currentKey][j] = parseData(object[currentKey][j]);
+				}
+			}
+			else if (typeof (object[currentKey]) === "object") {
+				parseData(object[currentKey]);
+			}
+		}
 
         //parse formatted values
         var formattedKeyValue = getFormattedKeyValue(currentKey, object[currentKey]);

tests/common-tests.js

@@ -2065,6 +2065,11 @@ describe("parseResponse", function () {
 		expect(response).to.be.deep.equal(mocks.responses.responseFormattedEntity());
 	});
 
+	it("parses formatted values - expand formatted values", function () {
+		var response = parseResponse(mocks.responses.responseFormattedWithExpand200.responseText, [], [{}]);
+		expect(response).to.be.deep.equal(mocks.responses.responseFormattedEntityWithExpand());
+	});
+
 	it("parses formatted values - array", function () {
 		var response = parseResponse(mocks.responses.multipleFormattedResponse.responseText, [], [{}]);
 		expect(response).to.be.deep.equal(mocks.responses.multipleFormatted());

tests/stubs.js

@@ -49,7 +49,20 @@ var dataStubs = {
         "[email protected]": "formatted",
         "[email protected]": "formatted",
         "[email protected]": "formatted"
-    },
+	},
+	testEntityFormattedWithExpand: {
+		name: "record",
+		subject: "test",
+		option: "value",
+		dwa_NavigationProperty: {
+			optionProp: "value",
+			"[email protected]": "formatted"
+		},
+		"@odata.context": "context",
+		"[email protected]": "formatted",
+		"[email protected]": "formatted",
+		"[email protected]": "formatted"
+	},
     testEntityFormattedAliased: {
         name: "record",
         subject: "test",
@@ -568,7 +581,11 @@ var responseStubs = {
     responseFormatted200: {
         status: 200,
         responseText: JSON.stringify(dataStubs.testEntityFormatted)
-    },
+	},
+	responseFormattedWithExpand200: {
+		status: 200,
+		responseText: JSON.stringify(dataStubs.testEntityFormattedWithExpand)
+	},
     responseFormattedAliased200: {
         status: 200,
         responseText: JSON.stringify(dataStubs.testEntityFormattedAliased)
@@ -973,7 +990,16 @@ var responseStubs = {
         stub.option_NavigationProperty = stub["[email protected]"];
         stub.option_LogicalName = stub["[email protected]"];
         return stub;
-    },
+	},
+	responseFormattedEntityWithExpand: function () {
+		var stub = dataStubs.testEntityFormattedWithExpand;
+		stub.oDataContext = stub["@odata.context"];
+		stub.dwa_NavigationProperty.optionProp_Formatted = stub.dwa_NavigationProperty["[email protected]"];
+		stub.option_Formatted = stub["[email protected]"];
+		stub.option_NavigationProperty = stub["[email protected]"];
+		stub.option_LogicalName = stub["[email protected]"];
+		return stub;
+	},
     responseFormattedAliasedEntity: function () {
         var stub = dataStubs.testEntityFormattedAliased;
         stub.oDataContext = stub["@odata.context"];