update tests to latest localtunnel client

This commit is contained in:
Roman Shtylman
2014-04-16 19:11:12 -04:00
parent 3f004f9b5c
commit bee0115b26
3 changed files with 24 additions and 34 deletions

View File

@@ -10,7 +10,7 @@
"dependencies": { "dependencies": {
"book": "1.3.1", "book": "1.3.1",
"optimist": "0.6.0", "optimist": "0.6.0",
"debug": "0.7.4", "debug": "0.8.0",
"bookrc": "0.0.1", "bookrc": "0.0.1",
"book-git": "0.0.2", "book-git": "0.0.2",
"book-raven": "1.0.1", "book-raven": "1.0.1",
@@ -29,8 +29,8 @@
"makeover": "0.0.1" "makeover": "0.0.1"
}, },
"devDependencies": { "devDependencies": {
"mocha": "1.14.0", "mocha": "1.18.2",
"localtunnel": "0.1.3" "localtunnel": "1.1.1"
}, },
"scripts": { "scripts": {
"test": "mocha --ui qunit -- test", "test": "mocha --ui qunit -- test",

View File

@@ -1,9 +1,9 @@
var http = require('http'); var http = require('http');
var url = require('url'); var url = require('url');
var assert = require('assert'); var assert = require('assert');
var localtunnel = require('localtunnel');
var localtunnel_server = require('../server')(); var localtunnel_server = require('../server')();
var localtunnel_client = require('localtunnel');
var lt_server_port var lt_server_port
@@ -31,19 +31,15 @@ test('setup local http server', function(done) {
}); });
test('setup localtunnel client', function(done) { test('setup localtunnel client', function(done) {
var opt = {
var client = localtunnel_client.connect({
host: 'http://localhost:' + lt_server_port, host: 'http://localhost:' + lt_server_port,
port: test._fake_port };
});
client.on('url', function(url) { localtunnel(test._fake_port, opt, function(err, tunnel) {
assert.ifError(err);
var url = tunnel.url;
assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url)); assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url));
test._fake_url = url; test._fake_url = url;
done();
});
client.on('error', function(err) {
done(err); done(err);
}); });
}); });
@@ -81,19 +77,17 @@ 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 opt = {
host: 'http://localhost:' + lt_server_port, host: 'http://localhost:' + lt_server_port,
port: test._fake_port,
subdomain: 'abcd' subdomain: 'abcd'
}); };
client.on('url', function(url) { localtunnel(test._fake_port, opt, function(err, tunnel) {
assert.ok(new RegExp('^http:\/\/abcd.localhost:' + lt_server_port + '$').test(url)); assert.ifError(err);
done(); var url = tunnel.url;
}); assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url));
test._fake_url = url;
client.on('error', function(err) { done(err);
console.error(err);
}); });
}); });

View File

@@ -1,13 +1,12 @@
var http = require('http'); var http = require('http');
var url = require('url'); var url = require('url');
var assert = require('assert'); var assert = require('assert');
var localtunnel = require('localtunnel');
var localtunnel_server = require('../server')({ var localtunnel_server = require('../server')({
max_tcp_sockets: 1 max_tcp_sockets: 1
}); });
var localtunnel_client = require('localtunnel');
var server; var server;
var lt_server_port; var lt_server_port;
@@ -39,19 +38,16 @@ 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 opt = {
host: 'http://localhost:' + lt_server_port, host: 'http://localhost:' + lt_server_port,
port: test._fake_port };
});
client.on('url', function(url) { localtunnel(test._fake_port, opt, function(err, tunnel) {
assert.ifError(err);
var url = tunnel.url;
assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url)); assert.ok(new RegExp('^http:\/\/.*localhost:' + lt_server_port + '$').test(url));
test._fake_url = url; test._fake_url = url;
done(); done(err);
});
client.on('error', function(err) {
console.error(err);
}); });
}); });