fix tests to be port agnostic

This commit is contained in:
Roman Shtylman
2013-11-21 21:22:49 -05:00
parent ae73e16ac2
commit 9ce57979cf
2 changed files with 17 additions and 12 deletions

View File

@@ -5,9 +5,12 @@ var assert = require('assert');
var localtunnel_server = require('../server')(); var localtunnel_server = require('../server')();
var localtunnel_client = require('localtunnel'); var localtunnel_client = require('localtunnel');
var lt_server_port
test('setup localtunnel server', function(done) { test('setup localtunnel server', function(done) {
localtunnel_server.listen(3000, function() { var server = localtunnel_server.listen(function() {
console.log('lt server on:', 3000); lt_server_port = server.address().port;
console.log('lt server on:', lt_server_port);
done(); done();
}); });
}); });
@@ -29,12 +32,12 @@ test('setup local http server', function(done) {
test('setup localtunnel client', function(done) { test('setup localtunnel client', function(done) {
var client = localtunnel_client.connect({ var client = localtunnel_client.connect({
host: 'http://localhost:' + 3000, host: 'http://localhost:' + lt_server_port,
port: test._fake_port port: test._fake_port
}); });
client.on('url', function(url) { 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; test._fake_url = url;
done(); done();
}); });
@@ -50,7 +53,7 @@ test('query localtunnel server w/ ident', function(done) {
var opt = { var opt = {
host: 'localhost', host: 'localhost',
port: 3000, port: lt_server_port,
headers: { headers: {
host: hostname host: hostname
}, },
@@ -78,13 +81,13 @@ test('query localtunnel server w/ ident', function(done) {
test('request specific domain', function(done) { test('request specific domain', function(done) {
var client = localtunnel_client.connect({ var client = localtunnel_client.connect({
host: 'http://localhost:' + 3000, host: 'http://localhost:' + lt_server_port,
port: test._fake_port, port: test._fake_port,
subdomain: 'abcd' subdomain: 'abcd'
}); });
client.on('url', function(url) { 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(); done();
}); });

View File

@@ -9,10 +9,12 @@ var localtunnel_server = require('../server')({
var localtunnel_client = require('localtunnel'); var localtunnel_client = require('localtunnel');
var server; var server;
var lt_server_port;
test('setup localtunnel server', function(done) { test('setup localtunnel server', function(done) {
localtunnel_server.listen(3000, function() { var lt_server = localtunnel_server.listen(function() {
console.log('lt server on:', 3000); lt_server_port = lt_server.address().port;
console.log('lt server on:', lt_server_port);
done(); done();
}); });
}); });
@@ -38,12 +40,12 @@ test('setup local http server', function(done) {
test('setup localtunnel client', function(done) { test('setup localtunnel client', function(done) {
var client = localtunnel_client.connect({ var client = localtunnel_client.connect({
host: 'http://localhost:' + 3000, host: 'http://localhost:' + lt_server_port,
port: test._fake_port port: test._fake_port
}); });
client.on('url', function(url) { 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; test._fake_url = url;
done(); done();
}); });
@@ -60,7 +62,7 @@ test('query localtunnel server w/ ident', function(done) {
var count = 0; var count = 0;
var opt = { var opt = {
host: 'localhost', host: 'localhost',
port: 3000, port: lt_server_port,
agent: false, agent: false,
headers: { headers: {
host: hostname host: hostname