diff --git a/package.json b/package.json index edbc3e1..6058eb9 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "book": "1.3.1", "optimist": "0.6.0", - "debug": "0.7.4", + "debug": "0.8.0", "bookrc": "0.0.1", "book-git": "0.0.2", "book-raven": "1.0.1", @@ -29,8 +29,8 @@ "makeover": "0.0.1" }, "devDependencies": { - "mocha": "1.14.0", - "localtunnel": "0.1.3" + "mocha": "1.18.2", + "localtunnel": "1.1.1" }, "scripts": { "test": "mocha --ui qunit -- test", diff --git a/test/basic.js b/test/basic.js index 2893616..cff62f6 100644 --- a/test/basic.js +++ b/test/basic.js @@ -1,9 +1,9 @@ var http = require('http'); var url = require('url'); var assert = require('assert'); +var localtunnel = require('localtunnel'); var localtunnel_server = require('../server')(); -var localtunnel_client = require('localtunnel'); var lt_server_port @@ -31,19 +31,15 @@ test('setup local http server', function(done) { }); test('setup localtunnel client', function(done) { - - var client = localtunnel_client.connect({ + var opt = { 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)); test._fake_url = url; - done(); - }); - - client.on('error', function(err) { done(err); }); }); @@ -81,19 +77,17 @@ test('query localtunnel server w/ ident', function(done) { }); test('request specific domain', function(done) { - var client = localtunnel_client.connect({ + var opt = { host: 'http://localhost:' + lt_server_port, - port: test._fake_port, subdomain: 'abcd' - }); + }; - client.on('url', function(url) { - assert.ok(new RegExp('^http:\/\/abcd.localhost:' + lt_server_port + '$').test(url)); - done(); - }); - - client.on('error', function(err) { - console.error(err); + 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)); + test._fake_url = url; + done(err); }); }); diff --git a/test/queue.js b/test/queue.js index 32a06a3..af1b2a7 100644 --- a/test/queue.js +++ b/test/queue.js @@ -1,13 +1,12 @@ var http = require('http'); var url = require('url'); var assert = require('assert'); +var localtunnel = require('localtunnel'); var localtunnel_server = require('../server')({ max_tcp_sockets: 1 }); -var localtunnel_client = require('localtunnel'); - var server; var lt_server_port; @@ -39,19 +38,16 @@ test('setup local http server', function(done) { }); test('setup localtunnel client', function(done) { - var client = localtunnel_client.connect({ + var opt = { 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)); test._fake_url = url; - done(); - }); - - client.on('error', function(err) { - console.error(err); + done(err); }); });