github/socket.io
1
1
Fork 0
mirror of https://github.com/socketio/socket.io.git synced 2026-04-30 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from einaros/master

Browse Source 
Proper websocket test fixes, after patching node-websocket-client
This commit is contained in:
Guillermo Rauch
2011-10-09 01:33:13 -07:00
parent dfebed38ab b3df2836e9
commit 61bd23f0f9
4 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
support/node-websocket-client/lib/websocket.js
View File

@@ -494,6 +494,13 @@ var WebSocket = function(url, proto, opts) {
return function(req, s, head) {
stream = s;
if (readyState == CLOSED) {
stream.end();
stream.destroy();
stream = undefined;
return;
}
stream.on('data', function(d) {
if (d.length <= 0) {
return;

1
test/common.js
View File

@@ -179,7 +179,6 @@ client = function (port) {
*/
create = function (cl) {
console.log('');
var manager = io.listen(cl.port);
manager.set('client store expiration', 0);
return manager;

7
test/transports.flashsocket.test.js
View File

@@ -168,13 +168,18 @@ module.exports = {
'flashsocket identifies as flashsocket': function (done) {
var cl = client(++ports)
, io = create(cl)
, messages = 0
, ws;
io.set('transports', ['flashsocket']);
io.sockets.on('connection', function (socket) {
socket.manager.transports[socket.id].name.should.equal('flashsocket');
ws.finishClose();
cl.end();
io.flashPolicyServer.close();
io.server.close();
done();
});
cl.handshake(function (sid) {
ws = websocket(cl, sid, 'flashsocket');
});

77
test/transports.websocket.test.js
View File

@@ -19,7 +19,24 @@ var sio = require('socket.io')
*/
module.exports = {
'websocket identifies as websocket': function (done) {
var cl = client(++ports)
, io = create(cl)
, ws;
io.set('transports', ['websocket']);
io.sockets.on('connection', function (socket) {
socket.manager.transports[socket.id].name.should.equal('websocket');
ws.finishClose();
cl.end();
io.server.close();
done();
});
cl.handshake(function (sid) {
ws = websocket(cl, sid);
});
},
'default websocket draft parser is used for unknown sec-websocket-version': function (done) {
var cl = client(++ports)
, io = create(cl)
@@ -28,17 +45,10 @@ module.exports = {
io.set('transports', ['websocket']);
io.sockets.on('connection', function (socket) {
socket.manager.transports[socket.id].protocolVersion.should.equal('hixie-76');
socket.on('disconnect', function () {
setTimeout(function () {
ws.finishClose();
cl.end();
io.server.close();
done();
}, 10);
});
socket.disconnect();
ws.finishClose();
cl.end();
io.server.close();
done();
});
cl.handshake(function (sid) {
@@ -48,22 +58,14 @@ module.exports = {
'hybi-07-12 websocket draft parser is used for sec-websocket-version: 8': function (done) {
var cl = client(++ports)
, io = create(cl)
, ws;
, io = create(cl);
io.set('transports', ['websocket']);
io.sockets.on('connection', function (socket) {
socket.manager.transports[socket.id].protocolVersion.should.equal('07-12');
socket.on('disconnect', function () {
setTimeout(function () {
cl.end();
io.server.close();
done();
}, 10);
});
socket.disconnect();
cl.end();
io.server.close();
done();
});
var headers = {
@@ -87,16 +89,9 @@ module.exports = {
io.sockets.on('connection', function (socket) {
socket.manager.transports[socket.id].protocolVersion.should.equal('16');
socket.on('disconnect', function () {
setTimeout(function () {
cl.end();
io.server.close();
done();
}, 10);
});
socket.disconnect();
cl.end();
io.server.close();
done();
});
var headers = {
@@ -131,10 +126,9 @@ module.exports = {
var sid = data.split(':')[0];
var url = '/socket.io/' + sio.protocol + '/websocket/' + sid;
cl.get(url, {headers: headers}, function (res, data) {});
res.client.onend = function() {
io.server.close();
done();
}
cl.end();
io.server.close();
done();
});
},
@@ -157,10 +151,9 @@ module.exports = {
var sid = data.split(':')[0];
var url = '/socket.io/' + sio.protocol + '/websocket/' + sid;
cl.get(url, {headers: headers}, function (res, data) {});
res.client.onend = function() {
io.server.close();
done();
}
cl.end();
io.server.close();
done();
});
},