Add support for remote servers

ladjs · Oct 15, 2012 · f481cfb · f481cfb
1 parent d4cedb0
commit f481cfb
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/lib/test.js b/lib/test.js
@@ -37,11 +37,10 @@ function Test(app, method, path) {
   this.redirects(0);
   this.app = app;
   this._fields = {};
-  var addr = app.address();
-  var portno = addr ? addr.port : port++;
-  if (!addr) app.listen(portno);
-  var protocol = app instanceof https.Server ? 'https' : 'http';
-  this.url = protocol + '://127.0.0.1:' + portno + path;
+
+  this.url = 'string' === typeof app
+    ? app + path
+    : this.serverAddress(app, path);
 }
 
 /**
@@ -50,6 +49,23 @@ function Test(app, method, path) {
 
 Test.prototype.__proto__ = Request.prototype;
 
+/**
+ * Returns a URL, extracted from a server.
+ *
+ * @param {Server} app
+ * @param {String} path
+ * @returns {String} URL address
+ * @api private
+ */
+
+Test.prototype.serverAddress = function(app, path){
+  var addr = app.address();
+  var portno = addr ? addr.port : port++;
+  if (!addr) app.listen(portno);
+  var protocol = app instanceof https.Server ? 'https' : 'http';
+  return protocol + '://127.0.0.1:' + portno + path;
+};
+
 /**
  * Expectations:
  *

diff --git a/test/supertest.js b/test/supertest.js
@@ -35,7 +35,25 @@ describe('request(app)', function(){
       .end(function(err, res){
         res.should.have.status(200);
         res.text.should.equal('hey');
-        done();
+        server.close(done)
+      });
+    });
+  })
+
+  it('should work with remote server', function(done){
+    var app = express();
+
+    app.get('/', function(req, res){
+      res.send('hey');
+    });
+
+    var server = app.listen(4000, function(){
+      request('http://localhost:4000')
+      .get('/')
+      .end(function(err, res){
+        res.should.have.status(200);
+        res.text.should.equal('hey');
+        server.close(done)
       });
     });
   })