fix bindings.res overwrite

Author: Matt Mason

src/WebJobs.Script/azurefunctions/functions.js

@@ -65,7 +65,7 @@ function createFunction(f) {
             }
             else {
                 var values = {};
-                if (context.res) {
+                if (context.res && context.bindings.res === undefined) {
                     context.bindings.res = context.res;
                 }
                 for (var name in context.bindings) {

test/WebJobs.Script.Tests.Integration/NodeEndToEndTests.cs

@@ -584,6 +584,27 @@ public async Task HttpTriggerPromise_TestBinding()
             Assert.Equal("returned from promise", body);
         }
 
+        [Fact]
+        public async Task HttpTrigger_Scenarios_ResBinding()
+        {
+            HttpRequestMessage request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(string.Format("http://localhost/api/httptrigger-scenarios")),
+                Method = HttpMethod.Post,
+            };
+            request.SetConfiguration(new HttpConfiguration());
+            request.Headers.Add("scenario", "resbinding");
+            Dictionary<string, object> arguments = new Dictionary<string, object>
+            {
+                { "req", request }
+            };
+            await Fixture.Host.CallAsync("HttpTrigger-Scenarios", arguments);
+
+            HttpResponseMessage response = (HttpResponseMessage)request.Properties[ScriptConstants.AzureFunctionsHttpResponseKey];
+            Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
+            Assert.Equal("test", await response.Content.ReadAsAsync<string>());
+        }
+
         [Fact]
         public async Task HttpTrigger_Scenarios_ScalarReturn_InBody()
         {

test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger-Scenarios/index.js

@@ -3,43 +3,53 @@
 module.exports = function (context, req) {
     var scenario = (req.headers && req.headers.scenario) || req.body.scenario;
 
-    if (scenario == "echo") {
-        context.res = req.body.value;
-    }
-    else if (scenario == "buffer")
-    {
-        context.res.send(Buffer.from('0001', 'hex'));
-    }
-    else if (scenario == "rawresponse") {
-        context.res = {
-            status: 200,
-            body: req.body.value,
-            headers: {
-                'Content-Type': req.body.contenttype
-            },
-            isRaw: true
-        }
-    }
-    else if (scenario == "rawresponsenocontenttype") {
-        context.res = {
-            status: 200,
-            body: req.body.value,
-            isRaw: true
-        }
-    }
-    else if (scenario == "content") {
-        if (req.headers.return) {
-            context.res = req.body;
-            context.done();
-        } else {
-            var sendFunc = req.headers.raw ? 'raw' : 'send';
-            context.res.type(req.headers.type)[sendFunc](req.body);
-        }
-    }
-    else {
-        context.res = {
-            status: 400
-        };
+    switch (scenario) {
+        case "echo":
+            context.res = req.body.value;
+            break;
+
+        case "buffer":
+            context.res.send(Buffer.from('0001', 'hex'));
+            break;
+
+        case "rawresponse":
+            context.res = {
+                status: 200,
+                body: req.body.value,
+                headers: {
+                    'Content-Type': req.body.contenttype
+                },
+                isRaw: true
+            }
+            break;
+
+        case "rawresponsenocontenttype":
+            context.res = {
+                status: 200,
+                body: req.body.value,
+                isRaw: true
+            }
+            break;
+
+        case "content":
+            if (req.headers.return) {
+                context.res = req.body;
+                context.done();
+            } else {
+                var sendFunc = req.headers.raw ? 'raw' : 'send';
+                context.res.type(req.headers.type)[sendFunc](req.body);
+            }
+            break;
+
+        case "resbinding":
+            context.bindings.res = { status: 202, body: "test" };
+            break;
+
+        default:
+            context.res = {
+                status: 400
+            };
+            break;
     }
 
     context.done();