From ceb9d12957ccdf45b506bb31d1b2a94fbe95d1d9 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 15 May 2019 15:55:45 +0200
Subject: [PATCH] Don't store ChatRoomOccupants on ChatRoomView

Helps with enforcing discipline of keeping them separate
---
 spec/muc.js               | 15 +++++++--------
 src/converse-muc-views.js |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/spec/muc.js b/spec/muc.js
index 0900c69a9..cb2622eda 100644
--- a/spec/muc.js
+++ b/spec/muc.js
@@ -1432,8 +1432,8 @@
 
                 await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'localhost', 'dummy');
                 var name;
-                var view = _converse.chatboxviews.get('lounge@localhost'),
-                    occupants = view.el.querySelector('.occupant-list');
+                const view = _converse.chatboxviews.get('lounge@localhost');
+                const occupants = view.el.querySelector('.occupant-list');
                 var presence, role, jid, model;
                 for (var i=0; i<mock.chatroom_names.length; i++) {
                     name = mock.chatroom_names[i];
@@ -1452,8 +1452,8 @@
                     .c('status').attrs({code:'110'}).nodeTree;
                     _converse.connection._dataRecv(test_utils.createRequest(presence));
                     expect(occupants.querySelectorAll('li').length).toBe(2+i);
-                    model = view.occupantsview.model.where({'nick': name})[0];
-                    var index = view.occupantsview.model.indexOf(model);
+                    model = view.model.occupants.where({'nick': name})[0];
+                    const index = view.model.occupants.indexOf(model);
                     expect(occupants.querySelectorAll('li .occupant-nick')[index].textContent.trim()).toBe(mock.chatroom_names[i]);
                 }
 
@@ -1506,8 +1506,8 @@
                     .c('status').attrs({code:'110'}).nodeTree;
                     _converse.connection._dataRecv(test_utils.createRequest(presence));
                     expect(occupants.querySelectorAll('li').length).toBe(2+i);
-                    model = view.occupantsview.model.where({'nick': name})[0];
-                    var index = view.occupantsview.model.indexOf(model);
+                    model = view.model.occupants.where({'nick': name})[0];
+                    const index = view.model.occupants.indexOf(model);
                     expect(occupants.querySelectorAll('li .occupant-nick')[index].textContent.trim()).toBe(mock.chatroom_names[i]);
                 }
 
@@ -1801,8 +1801,7 @@
                 spyOn(_converse.connection, 'send').and.callFake(function (stanza) {
                     sent_stanza = stanza;
                 });
-                const results_el =  view.occupantsview.el.querySelector('.suggestion-box__results');
-                const hint = results_el.firstElementChild;
+                const hint = await test_utils.waitUntil(() => view.el.querySelector('.suggestion-box__results li'));
                 expect(input.value).toBe('Felix');
                 expect(hint.textContent).toBe('Felix Amsel');
 
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index e669e8ae1..9745191cf 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -637,9 +637,9 @@ converse.plugins.add('converse-muc-views', {
 
             createOccupantsView () {
                 this.model.occupants.chatroomview = this;
-                this.occupantsview = new _converse.ChatRoomOccupantsView({'model': this.model.occupants});
+                const view = new _converse.ChatRoomOccupantsView({'model': this.model.occupants});
                 const container_el = this.el.querySelector('.chatroom-body');
-                container_el.insertAdjacentElement('beforeend', this.occupantsview.el);
+                container_el.insertAdjacentElement('beforeend', view.el);
             },
 
             initMentionAutoComplete () {