From 9ce57979cf963914df4ebfe4db3dfa165236f9ab Mon Sep 17 00:00:00 2001 From: Roman Shtylman Date: Thu, 21 Nov 2013 21:22:49 -0500 Subject: [PATCH] fix tests to be port agnostic --- test/basic.js | 17 ++++++++++------- test/queue.js | 12 +++++++----- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/test/basic.js b/test/basic.js index 6c0809d..fef2da5 100644 --- a/test/basic.js +++ b/test/basic.js @@ -5,9 +5,12 @@ var assert = require('assert'); var localtunnel_server = require('../server')(); var localtunnel_client = require('localtunnel'); +var lt_server_port + test('setup localtunnel server', function(done) { - localtunnel_server.listen(3000, function() { - console.log('lt server on:', 3000); + var server = localtunnel_server.listen(function() { + lt_server_port = server.address().port; + console.log('lt server on:', lt_server_port); done(); }); }); @@ -29,12 +32,12 @@ test('setup local http server', function(done) { test('setup localtunnel client', function(done) { var client = localtunnel_client.connect({ - host: 'http://localhost:' + 3000, + host: 'http://localhost:' + lt_server_port, port: test._fake_port }); client.on('url', function(url) { - assert.ok(/^http:\/\/.*localhost:3000$/.test(url)); + assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url)); test._fake_url = url; done(); }); @@ -50,7 +53,7 @@ test('query localtunnel server w/ ident', function(done) { var opt = { host: 'localhost', - port: 3000, + port: lt_server_port, headers: { host: hostname }, @@ -78,13 +81,13 @@ test('query localtunnel server w/ ident', function(done) { test('request specific domain', function(done) { var client = localtunnel_client.connect({ - host: 'http://localhost:' + 3000, + host: 'http://localhost:' + lt_server_port, port: test._fake_port, subdomain: 'abcd' }); client.on('url', function(url) { - assert.ok(/^http:\/\/abcd.localhost:3000$/.test(url)); + assert.ok(new RegExp('^http:\/\/abcd.localhost:' + lt_server_port + '$').test(url)); done(); }); diff --git a/test/queue.js b/test/queue.js index d75d920..32a06a3 100644 --- a/test/queue.js +++ b/test/queue.js @@ -9,10 +9,12 @@ var localtunnel_server = require('../server')({ var localtunnel_client = require('localtunnel'); var server; +var lt_server_port; test('setup localtunnel server', function(done) { - localtunnel_server.listen(3000, function() { - console.log('lt server on:', 3000); + var lt_server = localtunnel_server.listen(function() { + lt_server_port = lt_server.address().port; + console.log('lt server on:', lt_server_port); done(); }); }); @@ -38,12 +40,12 @@ test('setup local http server', function(done) { test('setup localtunnel client', function(done) { var client = localtunnel_client.connect({ - host: 'http://localhost:' + 3000, + host: 'http://localhost:' + lt_server_port, port: test._fake_port }); client.on('url', function(url) { - assert.ok(/^http:\/\/.*localhost:3000$/.test(url)); + assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url)); test._fake_url = url; done(); }); @@ -60,7 +62,7 @@ test('query localtunnel server w/ ident', function(done) { var count = 0; var opt = { host: 'localhost', - port: 3000, + port: lt_server_port, agent: false, headers: { host: hostname