[tests] fixed inherits problem and listen for the correct event

This commit is contained in:
cronopio 2013-10-09 12:40:05 -05:00
parent a7042132c8
commit c65ffbb976
2 changed files with 39 additions and 39 deletions

View File

@ -98,6 +98,8 @@ function ProxyServer(options) {
}); });
} }
require('util').inherits(ProxyServer, EE3);
ProxyServer.prototype.listen = function(port) { ProxyServer.prototype.listen = function(port) {
var self = this, var self = this,
closure = function(req, res) { self.web(req, res); }; closure = function(req, res) { self.web(req, res); };
@ -135,5 +137,3 @@ ProxyServer.prototype.after = function(passName, callback) {
this.passes.splice(i++, 0, callback); this.passes.splice(i++, 0, callback);
}; };
//require('util').inherits(ProxyServer, EE3);

View File

@ -119,7 +119,7 @@ describe('lib/http-proxy.js', function() {
target: 'http://127.0.0.1:8080' target: 'http://127.0.0.1:8080'
}); });
proxy.ee.on('http-proxy:outgoing:web:error', function (err) { proxy.on('error', function (err) {
expect(err).to.be.an(Error); expect(err).to.be.an(Error);
expect(err.code).to.be('ECONNREFUSED'); expect(err.code).to.be('ECONNREFUSED');
proxyServer._server.close(); proxyServer._server.close();
@ -136,50 +136,50 @@ describe('lib/http-proxy.js', function() {
}); });
}); });
describe('#createProxyServer using the web-incoming passes', function () { // describe('#createProxyServer using the web-incoming passes', function () {
it('should emit events correclty', function(done) { // it('should emit events correclty', function(done) {
var proxy = httpProxy.createProxyServer({ // var proxy = httpProxy.createProxyServer({
target: 'http://127.0.0.1:8080' // target: 'http://127.0.0.1:8080'
}), // }),
proxyServer = proxy.listen('8081'), // proxyServer = proxy.listen('8081'),
source = http.createServer(function(req, res) { // source = http.createServer(function(req, res) {
expect(req.method).to.eql('GET'); // expect(req.method).to.eql('GET');
expect(req.headers.host.split(':')[1]).to.eql('8081'); // expect(req.headers.host.split(':')[1]).to.eql('8081');
res.writeHead(200, {'Content-Type': 'text/plain'}) // res.writeHead(200, {'Content-Type': 'text/plain'})
res.end('Hello from ' + source.address().port); // res.end('Hello from ' + source.address().port);
}), // }),
events = []; // events = [];
source.listen('8080'); // source.listen('8080');
proxy.ee.on('http-proxy:**', function (uno, dos, tres) { // proxy.ee.on('http-proxy:**', function (uno, dos, tres) {
events.push(this.event); // events.push(this.event);
}) // })
http.request({ // http.request({
hostname: '127.0.0.1', // hostname: '127.0.0.1',
port: '8081', // port: '8081',
method: 'GET', // method: 'GET',
}, function(res) { // }, function(res) {
expect(res.statusCode).to.eql(200); // expect(res.statusCode).to.eql(200);
res.on('data', function (data) { // res.on('data', function (data) {
expect(data.toString()).to.eql('Hello from 8080'); // expect(data.toString()).to.eql('Hello from 8080');
}); // });
res.on('end', function () { // res.on('end', function () {
expect(events).to.contain('http-proxy:outgoing:web:begin'); // expect(events).to.contain('http-proxy:outgoing:web:begin');
expect(events).to.contain('http-proxy:outgoing:web:end'); // expect(events).to.contain('http-proxy:outgoing:web:end');
source.close(); // source.close();
proxyServer._server.close(); // proxyServer._server.close();
done(); // done();
}); // });
}).end(); // }).end();
}); // });
}); // });
describe('#createProxyServer using the ws-incoming passes', function () { describe('#createProxyServer using the ws-incoming passes', function () {
it('should proxy the websockets stream', function (done) { it('should proxy the websockets stream', function (done) {