fix: respect when status code is set with res.status (restifyGH-1429)

svozza · Aug 3, 2017 · e111d7d · e111d7d
1 parent 25d10f0
commit e111d7d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/response.js b/lib/response.js
@@ -304,7 +304,7 @@ Response.prototype.__send = function __send() {
 
     // Set sane defaults for optional arguments if they were not provided and
     // we failed to derive their values
-    code = code || 200;
+    code = code || self.statusCode || 200;
     headers = headers || {};
 
     // Populate our response object with the derived arguments

diff --git a/test/response.test.js b/test/response.test.js
@@ -562,3 +562,15 @@ test('GH-951: sendRaw accepts only strings or buffers', function (t) {
     // throw away response, we don't need it.
     STRING_CLIENT.get(join(LOCALHOST, '/16'));
 });
+
+test('GH-1429: setting code with res.status not respected', function (t) {
+    SERVER.get('/404', function (req, res, next) {
+        res.status(404);
+        res.send(null);
+    });
+
+    CLIENT.get(join(LOCALHOST, '/404'), function (err, _, res) {
+        t.equal(res.statusCode, 404);
+        t.end();
+    });
+});