Skip to content

Commit

Permalink
Make tests work with new versions of modules.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tristanz @kazuyukitanimura
tristanz authored and kazuyukitanimura committed Dec 5, 2011
1 parent e7fc25e commit 3cbe195
Show file tree
Hide file tree
Showing 8 changed files with 140 additions and 139 deletions.
2 changes: 1 addition & 1 deletion lib/parser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@

if (!pieces) return {};

var id = pieces[2] || ''
var id = parseInt(pieces[2]) || ''
, data = pieces[5] || ''
, packet = {
type: packets[pieces[1]]
Expand Down
15 changes: 8 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
, "url": "https://github.com/LearnBoost/socket.io-client.git"
}
, "dependencies": {
"uglify-js": "1.0.6"
, "websocket-client": "1.0.0"
, "xmlhttprequest": "1.2.2"
"uglify-js": ">=1.0.6"
, "websocket-client": ">=1.0.0"
, "xmlhttprequest": ">=1.2.2"
}
, "devDependencies": {
"expresso": "0.7.7"
, "express": "2.3.11"
, "jade": "0.12.1"
, "stylus": "0.13.3"
"expresso": ">=0.7.7"
, "express": ">=2.3.11"
, "jade": ">=0.12.1"
, "should": ">=0.0.1"
, "stylus": ">=0.13.3"
, "socket.io": "0.8.7"
, "socket.io-client": "0.8.7"
}
Expand Down
28 changes: 14 additions & 14 deletions test/events.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@

event.on('test', function (a, b) {
++calls;
a.should().eql('a');
b.should().eql('b');
a.should.eql('a');
b.should.eql('b');
});

event.emit('test', 'a', 'b');
calls.should().eql(1);
event.on.should().eql(event.addListener);
calls.should.eql(1);
event.on.should.eql(event.addListener);
},

'remove listener': function () {
Expand All @@ -32,8 +32,8 @@
event.on('test:more', empty);
event.removeAllListeners('test');

event.listeners('test').should().eql([]);
event.listeners('test:more').should().eql([empty]);
event.listeners('test').should.eql([]);
event.listeners('test:more').should.eql([empty]);
},

'remove all listeners with no arguments': function () {
Expand All @@ -45,8 +45,8 @@
event.removeAllListeners();

// TODO: with node 0.5 we'll change this to expect []
event.listeners('test').should().eql([empty]);
event.listeners('test:more').should().eql([empty]);
event.listeners('test').should.eql([empty]);
event.listeners('test:more').should.eql([empty]);
},

'remove listeners functions': function () {
Expand All @@ -59,16 +59,16 @@

event.on('one', one);
event.removeListener('one', one);
event.listeners('one').should().eql([]);
event.listeners('one').should.eql([]);

event.on('two', two);
event.removeListener('two', one);
event.listeners('two').should().eql([two]);
event.listeners('two').should.eql([two]);

event.on('three', three);
event.on('three', two);
event.removeListener('three', three);
event.listeners('three').should().eql([two]);
event.listeners('three').should.eql([two]);
},

'number of arguments': function () {
Expand All @@ -86,7 +86,7 @@
event.emit('test', null, null, null, null);
event.emit('test', null, null, null, null, null);

[0, 1, 2, 3, 4, 5].should().eql(number);
[0, 1, 2, 3, 4, 5].should.eql(number);
},

'once': function () {
Expand All @@ -102,14 +102,14 @@
event.emit('test', 'a', 'b');

function removed () {
should().fail('not removed');
should.fail('not removed');
};

event.once('test:removed', removed);
event.removeListener('test:removed', removed);
event.emit('test:removed');

calls.should().eql(1);
calls.should.eql(1);
}

};
Expand Down
8 changes: 4 additions & 4 deletions test/io.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
module.exports = {

'client version number': function () {
io.version.should().match(/([0-9]+)\.([0-9]+)\.([0-9]+)/);
io.version.should.match(/([0-9]+)\.([0-9]+)\.([0-9]+)/);
},

'socket.io protocol version': function () {
io.protocol.should().be.a('number');
io.protocol.toString().should().match(/^\d+$/);
io.protocol.should.be.a('number');
io.protocol.toString().should.match(/^\d+$/);
},

'socket.io available transports': function () {
(io.transports.length > 0).should().be_true;
(io.transports.length > 0).should.be_true;
}

};
Expand Down
38 changes: 19 additions & 19 deletions test/node/builder.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ var builder = require('../../bin/builder')
module.exports = {

'version number': function () {
builder.version.should().match(/([0-9]+)\.([0-9]+)\.([0-9]+)/);
builder.version.should().equal(require('../../lib/io').version);
builder.version.should.match(/([0-9]+)\.([0-9]+)\.([0-9]+)/);
builder.version.should.equal(require('../../lib/io').version);
},

'production build LOC': function () {
builder(function (err, result) {
should.strictEqual(err, null)

var lines = result.split('\n');
lines.length.should().be.below(5);
lines[0].should().match(/production/gi);
Buffer.byteLength(result).should().be.below(43000);
lines.length.should.be.below(5);
lines[0].should.match(/production/gi);
Buffer.byteLength(result).should.be.below(43000);
});
},

Expand All @@ -39,9 +39,9 @@ module.exports = {
should.strictEqual(err, null)

var lines = result.split('\n');
lines.length.should().be.above(5);
lines[0].should().match(/development/gi);
Buffer.byteLength(result).should().be.above(35000);
lines.length.should.be.above(5);
lines[0].should.match(/development/gi);
Buffer.byteLength(result).should.be.above(35000);
});
},

Expand All @@ -54,10 +54,10 @@ module.exports = {
, defaults = Object.keys(builder.transports);

/* XHR transport is private, but still available */
transports.length.should().be.equal(defaults.length + 1);
transports.length.should.be.equal(defaults.length + 1);

defaults.forEach(function (transport) {
transports.indexOf(transport).should().be.above(-1);
transports.indexOf(transport).should.be.above(-1);
})
});
},
Expand All @@ -69,8 +69,8 @@ module.exports = {
var io = common.execute(result).io
, transports = Object.keys(io.Transport);

transports.should().have.length(1);
transports[0].should().eql('websocket');
transports.should.have.length(1);
transports[0].should.eql('websocket');
});
},

Expand All @@ -79,7 +79,7 @@ module.exports = {
builder({ custom: [custom], minify: false }, function (err, result) {
should.strictEqual(err, null);

result.should().include.string(custom);
result.should.include.string(custom);
});
},

Expand All @@ -90,20 +90,20 @@ module.exports = {
builder({ custom: [custom], minify: false }, function (err, result) {
should.strictEqual(err, null);

result.should().not.include.string(custom);
result.should().not.include.string('// if node');
result.should().not.include.string('// end node');
result.should().not.include.string('"world"');
result.should.not.include.string(custom);
result.should.not.include.string('// if node');
result.should.not.include.string('// end node');
result.should.not.include.string('"world"');

result.should().include.string('var pew = "pew"');
result.should.include.string('var pew = "pew"');
});
},

'preserve the encoding during minification': function () {
builder(function (err, result) {
should.strictEqual(err, null);

result.should().match(/(\\ufffd)/g);
result.should.match(/(\\ufffd)/g);
})
},

Expand Down
Loading

0 comments on commit 3cbe195

Please sign in to comment.