Revert "[tests] fix test to use the new way to pass options"

This reverts commit 52ecd52.

Author: cronopio

lib/http-proxy/passes/web-incoming.js

@@ -28,6 +28,8 @@ web_o = Object.keys(web_o).map(function(pass) {
    */
 
   function deleteLength(req, res) {
+    // Now the options are stored on this
+    var options = this.options;
     if(req.method === 'DELETE' && !req.headers['content-length']) {
       req.headers['content-length'] = '0';
     }

test/lib-http-proxy-passes-web-incoming-test.js

@@ -8,7 +8,7 @@ describe('lib/http-proxy/passes/web.js', function() {
         method: 'DELETE',
         headers: {}
       };
-      httpProxy.deleteLength(stubRequest, {});
+      httpProxy.deleteLength(stubRequest, {}, {});
       expect(stubRequest.headers['content-length']).to.eql('0');
     })
   });
@@ -21,7 +21,7 @@ describe('lib/http-proxy/passes/web.js', function() {
         }
       }
 
-      httpProxy.timeout.call({ options: { timeout: 5000 }}, stubRequest, {});
+      httpProxy.timeout(stubRequest, {}, { timeout: 5000});
       expect(done).to.eql(5000);
     });
   });
@@ -36,7 +36,7 @@ describe('lib/http-proxy/passes/web.js', function() {
     }
 
     it('set the correct x-forwarded-* headers', function () {
-      httpProxy.XHeaders.call({ options: { xfwd: true }}, stubRequest, {});
+      httpProxy.XHeaders(stubRequest, {}, { xfwd: true });
       expect(stubRequest.headers['x-forwarded-for']).to.be('192.168.1.2');
       expect(stubRequest.headers['x-forwarded-port']).to.be('8080');
       expect(stubRequest.headers['x-forwarded-proto']).to.be('http');

test/lib-http-proxy-passes-ws-incoming-test.js

@@ -107,7 +107,7 @@ describe('lib/http-proxy/passes/ws-incoming.js', function () {
 
   describe('#XHeaders', function () {
     it('return if no forward request', function () {
-      var returnValue = httpProxy.XHeaders.call({ options: {}}, {}, {});
+      var returnValue = httpProxy.XHeaders({}, {}, {});
       expect(returnValue).to.be(undefined);
     });
 
@@ -119,7 +119,7 @@ describe('lib/http-proxy/passes/ws-incoming.js', function () {
         },
         headers: {}
       }
-      httpProxy.XHeaders.call({ options: { xfwd: true }}, stubRequest, {});
+      httpProxy.XHeaders(stubRequest, {}, { xfwd: true });
       expect(stubRequest.headers['x-forwarded-for']).to.be('192.168.1.2');
       expect(stubRequest.headers['x-forwarded-port']).to.be('8080');
       expect(stubRequest.headers['x-forwarded-proto']).to.be('ws');
@@ -136,7 +136,7 @@ describe('lib/http-proxy/passes/ws-incoming.js', function () {
         },
         headers: {}
       };
-      httpProxy.XHeaders.call({ options: { xfwd: true }}, stubRequest, {});
+      httpProxy.XHeaders(stubRequest, {}, { xfwd: true });
       expect(stubRequest.headers['x-forwarded-for']).to.be('192.168.1.3');
       expect(stubRequest.headers['x-forwarded-port']).to.be('8181');
       expect(stubRequest.headers['x-forwarded-proto']).to.be('wss');