From e362776b9fd3981a63e85998437f3b0a7142c5d9 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 31 May 2019 09:14:42 +0200
Subject: [PATCH] converse-muc-views: Don't prematurely insert MUC into the DOM

---
 spec/muc.js               | 11 ++++++-----
 src/converse-muc-views.js |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/muc.js b/spec/muc.js
index 2cc2ffc4c..61af471c5 100644
--- a/spec/muc.js
+++ b/spec/muc.js
@@ -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})
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index 78ad882a0..4ae97331d 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -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