Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix failing tests

Browse Source
This commit is contained in:
JC Brand 2016-07-19 13:24:22 +00:00
parent c1be16aaab
commit 5ffebda8c2
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spec/chatroom.js
View File

@ -216,7 +216,7 @@
}).nodeTree; }).nodeTree;
this.connection._dataRecv(test_utils.createRequest(presence)); this.connection._dataRecv(test_utils.createRequest(presence));
expect(view.onChatRoomPresence).toHaveBeenCalled(); expect(view.onChatRoomPresence).toHaveBeenCalled();
expect($occupants.find('li').length).toBe(i); expect($occupants.find('li.online').length).toBe(i);
} }
}.bind(converse)); }.bind(converse));
@ -239,7 +239,7 @@
var occupant = view.$el.find('.occupant-list').find('li'); var occupant = view.$el.find('.occupant-list').find('li');
expect(occupant.length).toBe(1); expect(occupant.length).toBe(1);
expect($(occupant).text()).toBe("moderatorman"); expect($(occupant).text()).toBe("moderatorman");
expect($(occupant).attr('class')).toBe('moderator'); expect($(occupant).attr('class').indexOf('moderator')).not.toBe(-1);
expect($(occupant).attr('title')).toBe('This user is a moderator'); expect($(occupant).attr('title')).toBe('This user is a moderator');
}.bind(converse)); }.bind(converse));
@ -471,6 +471,8 @@
var $occupants = view.$('.occupant-list'); var $occupants = view.$('.occupant-list');
expect($occupants.children().length).toBe(1); expect($occupants.children().length).toBe(1);
expect($occupants.children().first(0).text()).toBe("oldnick"); expect($occupants.children().first(0).text()).toBe("oldnick");
expect($occupants.children().first().hasClass('online')).toBe(true);
expect($chat_content.find('div.chat-info').length).toBe(1); expect($chat_content.find('div.chat-info').length).toBe(1);
expect($chat_content.find('div.chat-info').html()).toBe(__(view.newNicknameMessages["210"], "oldnick")); expect($chat_content.find('div.chat-info').html()).toBe(__(view.newNicknameMessages["210"], "oldnick"));
@ -494,8 +496,13 @@
expect(view.onChatRoomPresence).toHaveBeenCalled(); expect(view.onChatRoomPresence).toHaveBeenCalled();
expect($chat_content.find('div.chat-info').length).toBe(2); expect($chat_content.find('div.chat-info').length).toBe(2);
expect($chat_content.find('div.chat-info').last().html()).toBe(__(view.newNicknameMessages["303"], "newnick")); expect($chat_content.find('div.chat-info').last().html()).toBe(__(view.newNicknameMessages["303"], "newnick"));
// The occupant is still listed (because they have affiliation
// of "member"), but they don't have the "online" class
// anymore.
$occupants = view.$('.occupant-list'); $occupants = view.$('.occupant-list');
expect($occupants.children().length).toBe(0); expect($occupants.children().length).toBe(1);
expect($occupants.children().first().hasClass('online')).toBe(false);
presence = $pres().attrs({ presence = $pres().attrs({
from:'lounge@localhost/newnick', from:'lounge@localhost/newnick',

10
src/converse-muc.js
View File

@ -1143,10 +1143,12 @@
var occupant = this.findOccupant(data); var occupant = this.findOccupant(data);
switch (data.type) { switch (data.type) {
case 'unavailable': case 'unavailable':
if (_.contains(['owner', 'admin', 'member'], occupant.get('affiliation'))) { if (occupant) {
occupant.save({'online': false}); if (_.contains(['owner', 'admin', 'member'], occupant.get('affiliation'))) {
} else { occupant.save({'online': false});
occupant.destroy(); } else {
occupant.destroy();
}
} }
break; break;
default: default: