Merge pull request #1481 from burningtree/master

Fix baseUrl and redirections.

request.js

@@ -386,6 +386,7 @@ Request.prototype.init = function (options) {
     } else {
       self.uri = self.baseUrl + '/' + self.uri
     }
+    delete self.baseUrl
   }
 
   // A URI is needed by this point, throw if we haven't been able to get one

tests/test-baseUrl.js

@@ -6,8 +6,14 @@ var http = require('http')
   , url = require('url')
 
 var s = http.createServer(function(req, res) {
-  res.statusCode = 200
-  res.setHeader('X-PATH', req.url)
+  if(req.url === '/redirect/') {
+    res.writeHead(302, {
+      location : '/'
+    })
+  } else {
+    res.statusCode = 200
+    res.setHeader('X-PATH', req.url)
+  }
   res.end('ok')
 })
 
@@ -38,6 +44,17 @@ tape('baseUrl defaults', function(t) {
   })
 })
 
+tape('baseUrl and redirects', function(t) {
+  request('/', {
+    baseUrl: 'http://localhost:6767/redirect'
+  }, function(err, resp, body) {
+    t.equal(err, null)
+    t.equal(body, 'ok')
+    t.equal(resp.headers['x-path'], '/')
+    t.end()
+  })
+})
+
 function addTest(baseUrl, uri, expected) {
   tape('test baseurl="' + baseUrl + '" uri="' + uri + '"', function(t) {
     request(uri, { baseUrl: baseUrl }, function(err, resp, body) {