fix: set status code 200 for empty responses (#1627)

dherault · Dec 12, 2022 · 5c1efcf · 5c1efcf
1 parent cc5064c
commit 5c1efcf
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 22 deletions.
diff --git a/src/events/alb/HttpServer.js b/src/events/alb/HttpServer.js
@@ -313,7 +313,11 @@ export default class HttpServer {
     })
 
     const hapiMethod = method === 'ANY' ? '*' : method
-    const hapiOptions = {}
+    const hapiOptions = {
+      response: {
+        emptyStatusCode: 200,
+      },
+    }
 
     // skip HEAD routes as hapi will fail with 'Method name not allowed: HEAD ...'
     // for more details, check https://github.com/dherault/serverless-offline/issues/204

diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js
@@ -1045,6 +1045,9 @@ export default class HttpServer {
     const hapiOptions = {
       auth: authStrategyName,
       cors,
+      response: {
+        emptyStatusCode: 200,
+      },
       state,
       timeout: {
         socket: false,

diff --git a/tests/integration/alb-handler/handlerPayload.test.js b/tests/integration/alb-handler/handlerPayload.test.js
@@ -99,16 +99,16 @@ describe('ALB handler payload tests', function desc() {
 
     {
       description:
-        'when handler returns bad answer in promise should return 204',
+        'when handler returns bad answer in promise should return 200',
       path: '/dev/bad-answer-in-promise-handler',
-      status: 204,
+      status: 200,
     },
 
     {
       description:
-        'when handler returns bad answer in callback should return 204',
+        'when handler returns bad answer in callback should return 200',
       path: '/dev/bad-answer-in-callback-handler',
-      status: 204,
+      status: 200,
     },
 
     {
@@ -121,7 +121,7 @@ describe('ALB handler payload tests', function desc() {
     {
       description: 'test path with wildcards',
       path: '/dev/foo/test-resource-variable-handler/1',
-      status: 204,
+      status: 200,
     },
 
     {
@@ -268,16 +268,16 @@ describe('ALB handler payload tests with prepend off', function desc() {
 
     {
       description:
-        'when handler returns bad answer in promise should return 204',
+        'when handler returns bad answer in promise should return 200',
       path: '/bad-answer-in-promise-handler',
-      status: 204,
+      status: 200,
     },
 
     {
       description:
-        'when handler returns bad answer in callback should return 204',
+        'when handler returns bad answer in callback should return 200',
       path: '/bad-answer-in-callback-handler',
-      status: 204,
+      status: 200,
     },
 
     {
@@ -290,7 +290,7 @@ describe('ALB handler payload tests with prepend off', function desc() {
     {
       description: 'test path with wildcards',
       path: '/foo/test-resource-variable-handler/1',
-      status: 204,
+      status: 200,
     },
 
     {

diff --git a/tests/integration/handler/handlerPayload.test.js b/tests/integration/handler/handlerPayload.test.js
@@ -115,16 +115,16 @@ describe('handler payload tests', function desc() {
 
     {
       description:
-        'when handler returns bad answer in promise should return 204',
+        'when handler returns bad answer in promise should return 200',
       path: '/dev/bad-answer-in-promise-handler',
-      status: 204,
+      status: 200,
     },
 
     {
       description:
-        'when handler returns bad answer in callback should return 204',
+        'when handler returns bad answer in callback should return 200',
       path: '/dev/bad-answer-in-callback-handler',
-      status: 204,
+      status: 200,
     },
 
     {
@@ -283,16 +283,16 @@ describe('handler payload tests with prepend off', function desc() {
 
     {
       description:
-        'when handler returns bad answer in promise should return 204',
+        'when handler returns bad answer in promise should return 200',
       path: '/bad-answer-in-promise-handler',
-      status: 204,
+      status: 200,
     },
 
     {
       description:
-        'when handler returns bad answer in callback should return 204',
+        'when handler returns bad answer in callback should return 200',
       path: '/bad-answer-in-callback-handler',
-      status: 204,
+      status: 200,
     },
 
     {

diff --git a/tests/old-unit/offline.test.js b/tests/old-unit/offline.test.js
@@ -852,7 +852,7 @@ describe('Offline', () => {
 
       const res = await server.inject('/dev/headers')
 
-      assert.strictEqual(res.statusCode, 204)
+      assert.strictEqual(res.statusCode, 200)
       assert.strictEqual(res.headers['custom-header-1'], undefined)
       assert.strictEqual(res.headers['custom-header-2'], undefined)
 
@@ -914,7 +914,7 @@ describe('Offline', () => {
         url: '/dev/cookie',
       })
 
-      assert.strictEqual(res.statusCode, 204)
+      assert.strictEqual(res.statusCode, 200)
 
       await offline.end(true)
     })
@@ -1108,7 +1108,7 @@ describe('Offline', () => {
           url: '/dev/cookie',
         })
 
-        assert.strictEqual(res.statusCode, 204)
+        assert.strictEqual(res.statusCode, 200)
 
         await offline.end(true)
       })