Skip to content

Commit

Permalink
Merge pull request #33 from Tennu/353_parse
Browse files Browse the repository at this point in the history
Add failing unit test, add trim() to make test pass
  • Loading branch information
Havvy committed Jan 20, 2014
2 parents 462b5d4 + 83c80b6 commit c6ec509
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/message.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ var extensions = {
// :<server> 353 <me> = <channel> :<nicknames>
message.replyname = "RPL_NAMREPLY";
message.channel = message.params[2];
message.nicknames = message.params[3].split(" ");
message.nicknames = message.params[3].trim().split(" ");
},

"366": function (message) {
Expand Down
17 changes: 16 additions & 1 deletion test-src/message.sjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ var arg1 = 'arg-1';
var arg2 = 'arg-2';
var restargs = 'rest arguments';
var reason = 'Because I want to.';
var nick1 = "adam";
var nick2 = "beatrice";
var nick3 = "charlie";

var messages = {
generic: format('GENERIC'),
Expand All @@ -33,7 +36,8 @@ var messages = {
part_reason: format(':%s PART %s :%s', hostmask, channel, reason),

quit: format(':%s QUIT', hostmask),
quit_reason: format(':%s QUIT :%s', hostmask, reason)
quit_reason: format(':%s QUIT :%s', hostmask, reason),
a_353_with_whitespace: format(':%s 353 %s = %s :%s %s %s ', server, nickname, channel, nick1, nick2, nick3)
};

describe 'Message' {
Expand Down Expand Up @@ -168,5 +172,16 @@ describe 'Message' {
assert(message.hasOwnProperty('reason'));
}
}

describe '353:' {
it 'creates correct nicknames array' {
var message = Message(messages.a_353_with_whitespace, receiver);

assert(message.nicknames.length === 3);
assert(message.nicknames[0] === "adam");
assert(message.nicknames[1] === "beatrice");
assert(message.nicknames[2] === "charlie");
}
}
}
}
15 changes: 14 additions & 1 deletion test/message.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ var arg1 = 'arg-1';
var arg2 = 'arg-2';
var restargs = 'rest arguments';
var reason = 'Because I want to.';
var nick1 = 'adam';
var nick2 = 'beatrice';
var nick3 = 'charlie';
var messages = {
generic: format('GENERIC'),
generic_args: format('GENERIC %s %s :%s', arg1, arg2, restargs),
Expand All @@ -33,7 +36,8 @@ var messages = {
part: format(':%s PART %s', hostmask, channel),
part_reason: format(':%s PART %s :%s', hostmask, channel, reason),
quit: format(':%s QUIT', hostmask),
quit_reason: format(':%s QUIT :%s', hostmask, reason)
quit_reason: format(':%s QUIT :%s', hostmask, reason),
a_353_with_whitespace: format(':%s 353 %s = %s :%s %s %s ', server, nickname, channel, nick1, nick2, nick3)
};
describe('Message', function () {
describe('common properties', function () {
Expand Down Expand Up @@ -155,5 +159,14 @@ describe('Message', function () {
assert(message.hasOwnProperty('reason'));
});
});
describe('353:', function () {
it('creates correct nicknames array', function () {
var message = Message(messages.a_353_with_whitespace, receiver);
assert(message.nicknames.length === 3);
assert(message.nicknames[0] === 'adam');
assert(message.nicknames[1] === 'beatrice');
assert(message.nicknames[2] === 'charlie');
});
});
});
});

0 comments on commit c6ec509

Please sign in to comment.