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

converse-muc-views: Don't prematurely insert MUC into the DOM

Browse Source
This commit is contained in:
JC Brand 2019-05-31 09:14:42 +02:00
parent d86a657a66
commit e362776b9f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spec/muc.js
View File

@ -114,7 +114,7 @@
expect(room instanceof Backbone.Model).toBeTruthy();
chatroomview = _converse.chatboxviews.get(jid);
expect(chatroomview.is_chatroom).toBeTruthy();
expect(u.isVisible(chatroomview.el)).toBeTruthy();
await test_utils.waitUntil(() => u.isVisible(chatroomview.el));
// Test again, now that the room exists.
room = await _converse.api.rooms.open(jid);
@ -129,19 +129,19 @@
room = await _converse.api.rooms.open(jid);
expect(room instanceof Backbone.Model).toBeTruthy();
chatroomview = _converse.chatboxviews.get(jid.toLowerCase());
expect(u.isVisible(chatroomview.el)).toBeTruthy();
await test_utils.waitUntil(() => u.isVisible(chatroomview.el));
jid = 'leisure@localhost';
room = await _converse.api.rooms.open(jid);
expect(room instanceof Backbone.Model).toBeTruthy();
chatroomview = _converse.chatboxviews.get(jid.toLowerCase());
expect(u.isVisible(chatroomview.el)).toBeTruthy();
await test_utils.waitUntil(() => u.isVisible(chatroomview.el));
jid = 'leiSure@localhost';
room = await _converse.api.rooms.open(jid);
expect(room instanceof Backbone.Model).toBeTruthy();
chatroomview = _converse.chatboxviews.get(jid.toLowerCase());
expect(u.isVisible(chatroomview.el)).toBeTruthy();
await test_utils.waitUntil(() => u.isVisible(chatroomview.el));
chatroomview.close();
_converse.muc_instant_rooms = false;
@ -1286,6 +1286,7 @@
await _converse.api.rooms.open('coven@chat.shakespeare.lit', {'nick': 'some1'});
const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
await test_utils.waitUntil(() => u.isVisible(view.el));
spyOn(view.model, 'saveAffiliationAndRole').and.callThrough();
// We pretend this is a new room, so no disco info is returned.
const features_stanza = $iq({
@ -1305,7 +1306,7 @@
* </x>
* </presence></body>
*/
var presence = $pres({
const presence = $pres({
to: 'dummy@localhost/_converse.js-29092160',
from: 'coven@chat.shakespeare.lit/some1'
}).c('x', {xmlns: Strophe.NS.MUC_USER})

1
src/converse-muc-views.js
View File

@ -581,7 +581,6 @@ converse.plugins.add('converse-muc-views', {
this.render();
this.updateAfterMessagesFetched();
this.createOccupantsView();
this.insertIntoDOM();
this.registerHandlers();
/**
* Triggered once a groupchat has been opened