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

Bugfix, room subject wasn't being shown. Also added a test for it.

Browse Source
This commit is contained in:
JC Brand 2016-05-25 09:22:27 +00:00
parent 7b006f31d4
commit 22041b3d7f
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spec/chatroom.js
View File

@ -195,7 +195,7 @@
it("shows sent groupchat messages", function () { it("shows sent groupchat messages", function () {
test_utils.openChatRoom('lounge', 'localhost', 'dummy'); test_utils.openChatRoom('lounge', 'localhost', 'dummy');
spyOn(converse, 'emit'); spyOn(converse, 'emit');
var view = this.chatboxviews.get('lounge@localhost'); var view = converse.chatboxviews.get('lounge@localhost');
if (!view.$el.find('.chat-area').length) { view.renderChatArea(); } if (!view.$el.find('.chat-area').length) { view.renderChatArea(); }
var text = 'This is a sent message'; var text = 'This is a sent message';
view.$el.find('.chat-textarea').text(text); view.$el.find('.chat-textarea').text(text);
@ -214,7 +214,23 @@
expect($chat_content.find('.chat-msg-content').last().text()).toBe(text); expect($chat_content.find('.chat-msg-content').last().text()).toBe(text);
// We don't emit an event if it's our own message // We don't emit an event if it's our own message
expect(converse.emit.callCount, 1); expect(converse.emit.callCount, 1);
}.bind(converse)); });
it("shows received chatroom subject messages", function () {
var text = 'Jabber/XMPP Development | RFCs and Extensions: http://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org';
var stanza = Strophe.xmlHtmlNode(
'<message xmlns="jabber:client" to="jc@opkode.com/converse.js-60429116" type="groupchat" from="jdev@conference.jabber.org/ralphm">'+
' <subject>'+text+'</subject>'+
' <delay xmlns="urn:xmpp:delay" stamp="2014-02-04T09:35:39Z" from="jdev@conference.jabber.org"/>'+
' <x xmlns="jabber:x:delay" stamp="20140204T09:35:39" from="jdev@conference.jabber.org"/>'+
'</message>').firstChild;
test_utils.openChatRoom('jdev', 'conference.jabber.org', 'jc');
converse.connection._dataRecv(test_utils.createRequest(stanza));
var view = converse.chatboxviews.get('jdev@conference.jabber.org');
var $chat_content = view.$el.find('.chat-content');
expect($chat_content.find('.chat-info').length).toBe(1);
expect($chat_content.find('.chat-info').text()).toBe('Topic set by ralphm to: '+text);
});
it("informs users if their nicknames has been changed.", function () { it("informs users if their nicknames has been changed.", function () {
/* The service then sends two presence stanzas to the full JID /* The service then sends two presence stanzas to the full JID

2
src/converse-muc.js
View File

@ -844,7 +844,7 @@
// original message. So we also check the sender. // original message. So we also check the sender.
return msg.get('msgid') === msgid && msg.get('fullname') === sender; return msg.get('msgid') === msgid && msg.get('fullname') === sender;
}); });
if (dupes.length) { if (dupes && dupes.length) {
return true; return true;
} }
if (subject) { if (subject) {