Merge pull request hapijs#209 from walmartlabs/user/eran

Tests
jmonster · Nov 1, 2012 · e83ef1c · e83ef1c
2 parents b96282f + fa4d5fe
commit e83ef1c
Show file tree

Hide file tree

Showing 3 changed files with 362 additions and 309 deletions.
diff --git a/lib/error.js b/lib/error.js
@@ -120,7 +120,14 @@ internals.Error.passThrough = function (code, payload, contentType) {
         return response;
     };
 
-    var err = new internals.Error(code, 'Pass-through', { toResponse: format });
+    var err = new internals.Error(500, 'Pass-through', { toResponse: format });     // 500 code is only used internally and is not exposed when sent
+
+    err.passThrough = {
+        code: code,
+        payload: payload,
+        contentType: contentType
+    };
+
     return err;
 };
 

diff --git a/test/integration/request.js b/test/integration/request.js
@@ -17,15 +17,15 @@ describe('Request', function () {
         { method: 'GET', path: '/custom', config: { handler: customErrorHandler } },
     ]);
 
-    var makeRequest = function (path, callback) {
+    var makeRequest = function (method, path, callback) {
 
         var next = function (res) {
 
             return callback(res);
         };
 
         server.inject({
-            method: 'GET',
+            method: method,
             url: path
         }, next);
     }
@@ -45,11 +45,21 @@ describe('Request', function () {
 
     it('returns custom error response', function (done) {
 
-        makeRequest('/custom', function (rawRes) {
+        makeRequest('GET', '/custom', function (rawRes) {
 
             var headers = parseHeaders(rawRes.raw.res);
             expect(headers['Content-Type']).to.equal('text/plain');
             done();
         });
     });
+
+    it('returns valid OPTIONS response', function (done) {
+
+        makeRequest('OPTIONS', '/custom', function (rawRes) {
+
+            var headers = parseHeaders(rawRes.raw.res);
+            expect(headers['Access-Control-Allow-Origin']).to.equal('*');
+            done();
+        });
+    });
 });