Renames

Rename waitOnDiscoInfoForNewMUC to waitForNewMUCDiscoInfo
Rename waitForMUCDiscoFeatures to waitForMUCDiscoInfo

src/headless/plugins/bookmarks/tests/bookmarks.js

@@ -214,7 +214,7 @@ describe("A bookmark", function () {
             });
             expect(_converse.api.rooms.create).toHaveBeenCalled();
 
-            await mock.waitForMUCDiscoFeatures(_converse, jid);
+            await mock.waitForMUCDiscoInfo(_converse, jid);
             await mock.waitForReservedNick(_converse, jid, '');
             await u.waitUntil(() => state.chatboxes.length === 2);
 

src/headless/plugins/muc/tests/muc.js

@@ -136,7 +136,7 @@ describe("Groupchats", function () {
 
             _converse.api.connection.get().IQ_stanzas = [];
             _converse.api.connection.get()._dataRecv(mock.createRequest(result));
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const pres = await u.waitUntil(
                 () => sent_stanzas.slice(index).filter(s => s.nodeName === 'presence').pop());

src/headless/plugins/smacks/tests/smacks.js

@@ -296,7 +296,7 @@ describe("XEP-0198 Stream Management", function () {
 
         await api.waitUntil('chatBoxesFetched');
         const muc = _converse.chatboxes.get(muc_jid);
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
         await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
         await u.waitUntil(() => (muc.session.get('connection_status') === converse.ROOMSTATUS.ENTERED));
         await muc.messages.fetched;

src/plugins/bookmark-views/tests/bookmarks-list.js

@@ -127,7 +127,7 @@ describe("The bookmarks list modal", function () {
         expect(modal.querySelectorAll('.bookmarks.rooms-list .room-item').length).toBe(2);
         modal.querySelector('.bookmarks.rooms-list .open-room').click();
 
-        await mock.waitForMUCDiscoFeatures(_converse, 'first@conference.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'first@conference.shakespeare.lit');
         await mock.waitForReservedNick(_converse, 'first@conference.shakespeare.lit', '');
         await u.waitUntil(() => _converse.chatboxes.length === 2);
         expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(false);
@@ -135,7 +135,7 @@ describe("The bookmarks list modal", function () {
         await u.waitUntil(() => modal.querySelectorAll('.list-container--bookmarks .available-chatroom').length);
         modal.querySelector('.list-container--bookmarks .available-chatroom:last-child .open-room').click();
 
-        await mock.waitForMUCDiscoFeatures(_converse, 'theplay@conference.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'theplay@conference.shakespeare.lit');
         await mock.waitForReservedNick(_converse, 'theplay@conference.shakespeare.lit', '');
         await u.waitUntil(() => _converse.chatboxes.length === 3);
 

src/plugins/bookmark-views/tests/bookmarks.js

@@ -21,7 +21,7 @@ describe("A chat room", function () {
             });
             spyOn(_converse.ChatRoom.prototype, 'getAndPersistNickname').and.callThrough();
             _converse.api.rooms.open(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid);
             const room = await u.waitUntil(() => _converse.chatboxes.get(muc_jid));
             expect(room.get('nick')).toBe('Othello');
@@ -68,7 +68,7 @@ describe("Bookmarks", function () {
             </event>
         </message>`;
         _converse.api.connection.get()._dataRecv(mock.createRequest(stanza));
-        await mock.waitForMUCDiscoFeatures(_converse, 'theplay@conference.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'theplay@conference.shakespeare.lit');
 
         const { bookmarks } = _converse.state;
         await u.waitUntil(() => bookmarks.length);
@@ -251,7 +251,7 @@ describe("Bookmarks", function () {
         expect(theplay.get('password')).toBe('secret');
         expect(bookmarks.get('orchard@conference.shakespeare.lit').get('autojoin')).toBe(false);
 
-        await mock.waitForMUCDiscoFeatures(_converse, autojoin_muc);
+        await mock.waitForMUCDiscoInfo(_converse, autojoin_muc);
         await u.waitUntil(() => _converse.state.chatboxes.get(autojoin_muc));
 
         const features = [
@@ -259,7 +259,7 @@ describe("Bookmarks", function () {
             'jabber:iq:register',
             'muc_passwordprotected',
         ];
-        await mock.waitForMUCDiscoFeatures(_converse, autojoin_muc, features);
+        await mock.waitForMUCDiscoInfo(_converse, autojoin_muc, features);
 
         const { sent_stanzas } = _converse.api.connection.get();
         const sent_stanza = await u.waitUntil(

src/plugins/bookmark-views/tests/deprecated.js

@@ -38,7 +38,7 @@ describe("Bookmarks", function () {
             </event>
         </message>`;
         _converse.api.connection.get()._dataRecv(mock.createRequest(stanza));
-        await mock.waitForMUCDiscoFeatures(_converse, 'theplay@conference.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'theplay@conference.shakespeare.lit');
 
         const { bookmarks } = _converse.state;
         await u.waitUntil(() => bookmarks.length);
@@ -254,7 +254,7 @@ describe("The bookmarks list modal", function () {
         expect(modal.querySelectorAll('.bookmarks.rooms-list .room-item').length).toBe(2);
         modal.querySelector('.bookmarks.rooms-list .open-room').click();
 
-        await mock.waitForMUCDiscoFeatures(_converse, 'first@conference.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'first@conference.shakespeare.lit');
         await mock.waitForReservedNick(_converse, 'first@conference.shakespeare.lit', '');
         await u.waitUntil(() => _converse.chatboxes.length === 2);
         expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(false);
@@ -262,7 +262,7 @@ describe("The bookmarks list modal", function () {
         await u.waitUntil(() => modal.querySelectorAll('.list-container--bookmarks .available-chatroom').length);
         modal.querySelector('.list-container--bookmarks .available-chatroom:last-child .open-room').click();
 
-        await mock.waitForMUCDiscoFeatures(_converse, 'theplay@conference.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'theplay@conference.shakespeare.lit');
         await mock.waitForReservedNick(_converse, 'theplay@conference.shakespeare.lit', '');
         await u.waitUntil(() => _converse.chatboxes.length === 3);
 

src/plugins/mam-views/tests/mam.js

@@ -281,7 +281,7 @@ describe("Message Archive Management", function () {
             const muc_jid = 'orchard@chat.shakespeare.lit';
             const nick = 'romeo';
             const room_creation_promise = api.rooms.open(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid, nick);
             await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
             await room_creation_promise;

src/plugins/muc-views/tests/component.js

@@ -12,7 +12,7 @@ describe("The <converse-muc> component", function () {
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
         const muc_creation_promise = api.rooms.open(muc_jid, {nick, 'hidden': true}, false);
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid, []);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid, []);
         await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
 
         await muc_creation_promise;
@@ -45,7 +45,7 @@ describe("The <converse-muc> component", function () {
 
 
         const muc_creation_promise = api.rooms.open(muc_jid, {nick, 'hidden': true}, false);
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid, []);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid, []);
         await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
         await muc_creation_promise;
         const model = _converse.chatboxes.get(muc_jid);
@@ -79,7 +79,7 @@ describe("The <converse-muc> component", function () {
 
         const muc2_jid = 'bar@montague.lit';
         const muc2_creation_promise = api.rooms.open(muc2_jid, {nick, 'hidden': true}, false);
-        await mock.waitForMUCDiscoFeatures(_converse, muc2_jid, []);
+        await mock.waitForMUCDiscoInfo(_converse, muc2_jid, []);
         await mock.receiveOwnMUCPresence(_converse, muc2_jid, nick);
         await muc2_creation_promise;
         const model2 = _converse.chatboxes.get(muc2_jid);

src/plugins/muc-views/tests/member-lists.js

@@ -93,7 +93,7 @@ describe("A Groupchat", function () {
                 ];
                 const nick = 'romeo';
                 _converse.api.rooms.open(muc_jid);
-                await mock.waitForMUCDiscoFeatures(_converse, muc_jid, features);
+                await mock.waitForMUCDiscoInfo(_converse, muc_jid, features);
                 await mock.waitForReservedNick(_converse, muc_jid, nick);
                 mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
 

src/plugins/muc-views/tests/muc-add-modal.js

@@ -23,7 +23,7 @@ describe('The "Groupchats" Add modal', function () {
             modal.querySelector('input[name="chatroom"]').value = muc_jid;
             modal.querySelector('form input[type="submit"]').click();
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await u.waitUntil(() => _converse.chatboxes.length);
             await u.waitUntil(() => sizzle('.chatroom', _converse.el).filter(u.isVisible).length === 1);
         })
@@ -43,7 +43,7 @@ describe('The "Groupchats" Add modal', function () {
             nick_input.value = 'max';
 
             modal.querySelector('form input[type="submit"]').click();
-            await mock.waitForMUCDiscoFeatures(_converse, 'lounge@muc.example.org');
+            await mock.waitForMUCDiscoInfo(_converse, 'lounge@muc.example.org');
             await u.waitUntil(() => _converse.chatboxes.length);
             await u.waitUntil(() => sizzle('.chatroom', _converse.el).filter(u.isVisible).length === 1);
             expect(_converse.chatboxes.models.map(m => m.get('id')).includes('lounge@muc.example.org')).toBe(true);
@@ -57,7 +57,7 @@ describe('The "Groupchats" Add modal', function () {
             nick_input = modal.querySelector('input[name="nickname"]');
             nick_input.value = 'max';
             modal.querySelector('form input[type="submit"]').click();
-            await mock.waitForMUCDiscoFeatures(_converse, 'lounge@conference.example.org');
+            await mock.waitForMUCDiscoInfo(_converse, 'lounge@conference.example.org');
             await u.waitUntil(() => _converse.chatboxes.models.filter(c => c.get('type') === 'chatroom').length === 2);
             await u.waitUntil(() => sizzle('.chatroom', _converse.el).filter(u.isVisible).length === 2);
             expect(_converse.chatboxes.models.map(m => m.get('id')).includes('lounge@conference.example.org')).toBe(
@@ -81,7 +81,7 @@ describe('The "Groupchats" Add modal', function () {
             let nick_input = modal.querySelector('input[name="nickname"]');
             nick_input.value = 'max';
             modal.querySelector('form input[type="submit"]').click();
-            await mock.waitForMUCDiscoFeatures(_converse, 'lounge@muc.example.org');
+            await mock.waitForMUCDiscoInfo(_converse, 'lounge@muc.example.org');
             await u.waitUntil(() => _converse.chatboxes.length);
             await u.waitUntil(() => sizzle('.chatroom', _converse.el).filter(u.isVisible).length === 1);
             expect(_converse.chatboxes.models.map(m => m.get('id')).includes('lounge@muc.example.org')).toBe(true);
@@ -95,7 +95,7 @@ describe('The "Groupchats" Add modal', function () {
             nick_input = modal.querySelector('input[name="nickname"]');
             nick_input.value = 'max';
             modal.querySelector('form input[type="submit"]').click();
-            await mock.waitForMUCDiscoFeatures(_converse, 'lounge-conference@muc.example.org');
+            await mock.waitForMUCDiscoInfo(_converse, 'lounge-conference@muc.example.org');
             await u.waitUntil(
                 () => _converse.chatboxes.models.filter(c => c.get('type') === 'chatroom').length === 2
             );
@@ -133,7 +133,7 @@ describe('The "Groupchats" Add modal', function () {
 
             await mock.waitUntilDiscoConfirmed(_converse, domain, [], [], ['muc.example.org'], 'items');
             await mock.waitUntilDiscoConfirmed(_converse, 'muc.example.org', [], [Strophe.NS.MUC]);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             await u.waitUntil(() => sizzle('.chatroom', _converse.el).filter(u.isVisible).length === 1);
             expect(_converse.chatboxes.models.map(m => m.get('id')).includes(muc_jid)).toBe(true);
@@ -141,7 +141,7 @@ describe('The "Groupchats" Add modal', function () {
             const muc = _converse.chatboxes.get(muc_jid);
             expect(muc.get('name')).toBe('The Lounge');
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             // Own presence which states that the room is locked and needs to
             // be configured (code 201)
@@ -256,7 +256,7 @@ describe('The "Groupchats" Add modal', function () {
 
             modal.querySelector('form input[type="submit"]').click();
 
-            await mock.waitForMUCDiscoFeatures(_converse, 'into-the-ather-a-journey@montague.lit');
+            await mock.waitForMUCDiscoInfo(_converse, 'into-the-ather-a-journey@montague.lit');
             await u.waitUntil(() => sizzle('.chatroom', _converse.el).filter(u.isVisible).length === 1);
             expect(_converse.chatboxes.models.map(m => m.get('id')).includes('into-the-ather-a-journey@montague.lit')).toBe(true);
 

src/plugins/muc-views/tests/muc-api.js

@@ -118,7 +118,7 @@ describe("Groupchats", function () {
 
             // Test on groupchat that's not yet open
             let promise = _converse.api.rooms.open(jid);
-            await mock.waitForMUCDiscoFeatures(_converse, jid);
+            await mock.waitForMUCDiscoInfo(_converse, jid);
             await mock.waitForReservedNick(_converse, jid, nick);
 
             let room = await promise;
@@ -138,7 +138,7 @@ describe("Groupchats", function () {
             // Test with mixed case in JID
             jid = 'Leisure@montague.lit';
             promise  = _converse.api.rooms.open(jid);
-            await mock.waitForMUCDiscoFeatures(_converse, jid);
+            await mock.waitForMUCDiscoInfo(_converse, jid);
             await mock.waitForReservedNick(_converse, jid, nick);
             room = await promise;
             expect(room instanceof Model).toBeTruthy();
@@ -175,7 +175,7 @@ describe("Groupchats", function () {
                     'whois': 'anyone'
                 }
             });
-            await mock.waitForMUCDiscoFeatures(_converse, jid);
+            await mock.waitForMUCDiscoInfo(_converse, jid);
             room = await promise;
             expect(room instanceof Model).toBeTruthy();
 

src/plugins/muc-views/tests/muc-list-modal.js

@@ -74,7 +74,7 @@ describe('The "Groupchats" List modal', function () {
 
             rooms[4].querySelector('.open-room').click();
 
-            await mock.waitForMUCDiscoFeatures(_converse, 'inverness@chat.shakespeare.lit');
+            await mock.waitForMUCDiscoInfo(_converse, 'inverness@chat.shakespeare.lit');
             await mock.waitForReservedNick(_converse, 'inverness@chat.shakespeare.lit', 'romeo');
             await u.waitUntil(() => _converse.chatboxes.length > 1);
 

src/plugins/muc-views/tests/muc-mentions.js

@@ -19,7 +19,7 @@ describe("MUC Mention Notfications", function () {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
         const muc_creation_promise = api.rooms.open(muc_jid, { nick }, false);
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid, []);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid, []);
         await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
         await muc_creation_promise;
 

src/plugins/muc-views/tests/muc.js

@@ -17,7 +17,7 @@ describe("Groupchats", function () {
             const muc_jid = 'lounge@montague.lit';
             const nick = 'nicky';
             const promise = api.rooms.open(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid, '');
             const muc = await promise;
             await muc.initialized;
@@ -31,7 +31,7 @@ describe("Groupchats", function () {
             view.querySelector('input[type=submit]').click();
             expect(view.model.join).toHaveBeenCalled();
 
-            await mock.waitOnDiscoInfoForNewMUC(_converse, muc_jid);
+            await mock.waitForNewMUCDiscoInfo(_converse, muc_jid);
 
             _converse.api.connection.get().IQ_stanzas = [];
             await u.waitUntil(() => view.model.session.get('connection_status') === converse.ROOMSTATUS.CONNECTING);
@@ -91,7 +91,7 @@ describe("Groupchats", function () {
             const { api } = _converse;
             const muc_jid = 'orchard@chat.shakespeare.lit';
             api.rooms.get(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid, 'romeo');
             await mock.receiveOwnMUCPresence(_converse, muc_jid, 'romeo');
 
@@ -115,7 +115,7 @@ describe("Groupchats", function () {
             const muc_jid = 'orchard@chat.shakespeare.lit';
             const nick = 'romeo';
             api.rooms.open(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid);
 
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
@@ -140,7 +140,7 @@ describe("Groupchats", function () {
             nick_input.value = nick;
             view.querySelector('.muc-nickname-form input[type="submit"]').click();
             _converse.api.connection.get().IQ_stanzas = [];
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await u.waitUntil(() => view.model.session.get('connection_status') === converse.ROOMSTATUS.CONNECTING);
             await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
         }));
@@ -202,7 +202,7 @@ describe("Groupchats", function () {
 
             while (sent_IQs.length) { sent_IQs.pop(); } // Clear so that we don't match the older query
             await _converse.api.connection.reconnect();
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid, []);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid, []);
             await u.waitUntil(() => (view.model.session.get('connection_status') === converse.ROOMSTATUS.CONNECTING));
 
             // The user has just entered the room (because join was called)
@@ -511,7 +511,7 @@ describe("Groupchats", function () {
             await u.waitUntil(()  => view.querySelector('.chat-msg__text a'));
             view.querySelector('.chat-msg__text a').click();
 
-            await mock.waitForMUCDiscoFeatures(_converse, 'coven@chat.shakespeare.lit');
+            await mock.waitForMUCDiscoInfo(_converse, 'coven@chat.shakespeare.lit');
             await mock.waitForReservedNick(_converse, 'coven@chat.shakespeare.lit', 'romeo');
             await u.waitUntil(() => _converse.chatboxes.length === 3)
             expect(_converse.chatboxes.pluck('id').includes('coven@chat.shakespeare.lit')).toBe(true);
@@ -523,7 +523,7 @@ describe("Groupchats", function () {
             const muc_jid = 'coven@chat.shakespeare.lit';
             const nick = 'romeo';
             _converse.api.rooms.open(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid, nick);
 
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
@@ -557,7 +557,7 @@ describe("Groupchats", function () {
             const muc_jid = 'coven@chat.shakespeare.lit';
             const nick = 'some1';
             const room_creation_promise = _converse.api.rooms.open(muc_jid, {nick});
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             const sent_stanzas = _converse.api.connection.get().sent_stanzas;
             await u.waitUntil(() => sent_stanzas.filter(iq => sizzle('presence history', iq).length));
 
@@ -1063,7 +1063,7 @@ describe("Groupchats", function () {
             const muc_jid = 'coven@chat.shakespeare.lit';
             _converse.api.rooms.open(muc_jid, {'nick': 'some1'});
 
-            await mock.waitOnDiscoInfoForNewMUC(_converse, muc_jid);
+            await mock.waitForNewMUCDiscoInfo(_converse, muc_jid);
 
             const presence =
                 stx`<presence to='${own_jid}'
@@ -1080,7 +1080,7 @@ describe("Groupchats", function () {
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
             while (sent_IQs.length) sent_IQs.pop();
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
             await u.waitUntil(() => u.isVisible(view));
@@ -1273,7 +1273,7 @@ describe("Groupchats", function () {
                 'vcard-temp',
             ]
             await mock.openAndEnterMUC(_converse, muc_jid, 'some1', features);
-            await mock.waitOnDiscoInfoForNewMUC(_converse, muc_jid);
+            await mock.waitForNewMUCDiscoInfo(_converse, muc_jid);
 
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
             await u.waitUntil(() => u.isVisible(view));
@@ -1473,7 +1473,7 @@ describe("Groupchats", function () {
             const { api } = _converse;
             const muc_jid = 'problematic@muc.montague.lit';
             api.rooms.open(muc_jid, { nick: 'romeo' });
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const presence =
                 stx`<presence from="problematic@muc.montague.lit"
@@ -1596,7 +1596,7 @@ describe("Groupchats", function () {
                    <x xmlns="jabber:x:conference" jid="${muc_jid}" reason="${reason}"/>
                 </message>`.tree();
             const promise = _converse.onDirectMUCInvitation(stanza);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid, 'romeo');
             await mock.receiveOwnMUCPresence(_converse, muc_jid, 'romeo');
             await promise;
@@ -2259,7 +2259,7 @@ describe("Groupchats", function () {
             const { api } = _converse;
             const muc_jid = 'protected@montague.lit';
             api.rooms.open(muc_jid, { nick: 'romeo' });
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const presence =
                     stx`<presence from="${muc_jid}/romeo"
@@ -2397,7 +2397,7 @@ describe("Groupchats", function () {
             const { api } = _converse;
             const muc_jid = 'impermissable@muc.montague.lit'
             api.rooms.open(muc_jid, { nick: 'romeo' });
-            await mock.waitOnDiscoInfoForNewMUC(_converse, muc_jid);
+            await mock.waitForNewMUCDiscoInfo(_converse, muc_jid);
 
             const presence =
                 stx`<presence xmlns="jabber:client"
@@ -2414,7 +2414,7 @@ describe("Groupchats", function () {
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
             while (sent_IQs.length) sent_IQs.pop();
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
             const el = await u.waitUntil(() => view.querySelector('.chatroom-body converse-muc-disconnected .disconnect-msg:last-child'));

src/plugins/muc-views/tests/nickname.js

@@ -247,7 +247,7 @@ describe("A MUC", function () {
             const IQ_stanzas = _converse.api.connection.get().IQ_stanzas;
             const muc_jid = 'lounge@montague.lit';
             _converse.api.rooms.open(muc_jid);
-            await mock.waitOnDiscoInfoForNewMUC(_converse, muc_jid);
+            await mock.waitForNewMUCDiscoInfo(_converse, muc_jid);
 
             const iq = await u.waitUntil(() => IQ_stanzas.filter(
                     s => sizzle(`iq[to="${muc_jid}"] query[node="x-roomuser-item"]`, s).length
@@ -294,7 +294,7 @@ describe("A MUC", function () {
             while (IQ_stanzas.length) IQ_stanzas.pop();
 
             // Now that the user has entered the groupchat, the features are requested again.
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
             await u.waitUntil(() => (view.model.session.get('connection_status') === converse.ROOMSTATUS.ENTERED));
@@ -311,7 +311,7 @@ describe("A MUC", function () {
             const { api } = _converse;
             const muc_jid = 'roomy@muc.montague.lit';
             api.rooms.open(muc_jid);
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await mock.waitForReservedNick(_converse, muc_jid, '');
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
             expect(view.model.get('nick')).toBe('Benedict-Cucumberpatch');
@@ -323,7 +323,7 @@ describe("A MUC", function () {
             const { api } = _converse;
             const muc_jid = 'conflicted@muc.montague.lit';
             api.rooms.open(muc_jid, { nick: 'romeo' });
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             _converse.api.connection.get()._dataRecv(mock.createRequest(stx`
                 <presence
@@ -351,7 +351,7 @@ describe("A MUC", function () {
 
             api.settings.set('muc_nickname_from_jid', true);
             api.rooms.open(muc_jid, { nick: 'romeo' });
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const connection = api.connection.get();
             const sent_stanzas = connection.sent_stanzas;
@@ -377,7 +377,7 @@ describe("A MUC", function () {
                 </presence>`;
             api.connection.get()._dataRecv(mock.createRequest(presence));
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             let sent_stanza = await u.waitUntil(() => sent_stanzas.filter(iq => sizzle('presence history', iq).length).pop());
             expect(sent_stanza).toEqualStanza(stx`
@@ -409,7 +409,7 @@ describe("A MUC", function () {
                 </presence>`;
             _converse.api.connection.get()._dataRecv(mock.createRequest(presence));
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             sent_stanza = await u.waitUntil(() => sent_stanzas.filter(iq => sizzle('presence history', iq).length).pop());
             expect(sent_stanza).toEqualStanza(stx`
@@ -441,7 +441,7 @@ describe("A MUC", function () {
                 </presence>`;
             _converse.api.connection.get()._dataRecv(mock.createRequest(presence));
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             sent_stanza = await u.waitUntil(() => sent_stanzas.filter(iq => sizzle('presence history', iq).length).pop());
             expect(sent_stanza).toEqualStanza(stx`
@@ -463,7 +463,7 @@ describe("A MUC", function () {
             const { api } = _converse;
             const muc_jid = 'conformist@muc.montague.lit'
             api.rooms.open(muc_jid, { nick: 'romeo' });
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
             const presence = stx`
                 <presence
@@ -505,7 +505,7 @@ describe("A MUC", function () {
             expect(modal.querySelector('input[name="nickname"]')).toBe(null);
             modal.querySelector('form input[type="submit"]').click();
 
-            await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+            await mock.waitForMUCDiscoInfo(_converse, muc_jid);
             await u.waitUntil(() => _converse.chatboxes.length > 1);
             const chatroom = _converse.chatboxes.get(muc_jid);
             expect(chatroom.get('nick')).toBe('romeo');

src/plugins/muc-views/tests/rai.js

@@ -137,7 +137,7 @@ describe("XEP-0437 Room Activity Indicators", function () {
         const sent_stanzas = _converse.api.connection.get().sent_stanzas;
 
         const muc_creation_promise = api.rooms.open(muc_jid, { nick }, false);
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid, []);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid, []);
         await mock.receiveOwnMUCPresence(_converse, muc_jid, nick);
         await muc_creation_promise;
 

src/plugins/roomslist/tests/grouplists.js

@@ -18,7 +18,7 @@ describe("The list of MUC domains", function () {
 
         let muc_jid = 'room@conference.shakespeare.lit';
         _converse.api.rooms.open(muc_jid, { nick: 'JC' });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         const lview = controlbox.querySelector('converse-rooms-list');
         // Check that the group is shown
@@ -40,7 +40,7 @@ describe("The list of MUC domains", function () {
         // domain group.
         muc_jid = 'secondroom@conference.shakespeare.lit';
         _converse.api.rooms.open(muc_jid, { nick: 'JC' });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         await u.waitUntil(() => lview.querySelectorAll(".open-room").length > 1);
         group_els = lview.querySelectorAll(".muc-domain-group");
@@ -51,7 +51,7 @@ describe("The list of MUC domains", function () {
 
         muc_jid = 'lounge@montague.lit';
         _converse.api.rooms.open(muc_jid, { nick: 'romeo' });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         await u.waitUntil(() => lview.querySelectorAll(".open-room").length > 2);
         room_els = lview.querySelectorAll(".open-room");
@@ -103,7 +103,7 @@ describe("A MUC domain group", function () {
         const nick = 'JC';
         const muc_jid = 'room@conference.shakespeare.lit';
         _converse.api.rooms.open(muc_jid, { nick });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         const lview = controlbox.querySelector('converse-rooms-list');
         await u.waitUntil(() => lview.querySelectorAll(".muc-domain-group").length);

src/plugins/roomslist/tests/roomslist.js

@@ -22,7 +22,7 @@ describe("A list of open groupchats", function () {
 
         let muc_jid = 'room@conference.shakespeare.lit';
         api.rooms.open(muc_jid, { nick: 'romeo' });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         const lview = controlbox.querySelector('converse-rooms-list');
         await u.waitUntil(() => lview.querySelectorAll(".open-room").length);
@@ -32,7 +32,7 @@ describe("A list of open groupchats", function () {
 
         muc_jid = 'lounge@montague.lit';
         api.rooms.open(muc_jid, { nick: 'romeo' });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         await u.waitUntil(() => lview.querySelectorAll(".open-room").length > 1);
         room_els = lview.querySelectorAll(".open-room");
@@ -117,7 +117,7 @@ describe("A groupchat shown in the groupchats list", function () {
         const muc_jid = 'coven@chat.shakespeare.lit';
 
         _converse.api.rooms.open(muc_jid, {'nick': 'some1'}, true);
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         const lview = controlbox.querySelector('converse-rooms-list');
         await u.waitUntil(() => lview.querySelectorAll(".open-room").length);
@@ -130,7 +130,7 @@ describe("A groupchat shown in the groupchats list", function () {
         expect(item.querySelector('.open-room span').textContent.trim()).toBe('Coven');
 
         _converse.api.rooms.open('balcony@chat.shakespeare.lit', {'nick': 'some1'}, true);
-        await mock.waitForMUCDiscoFeatures(_converse, 'balcony@chat.shakespeare.lit');
+        await mock.waitForMUCDiscoInfo(_converse, 'balcony@chat.shakespeare.lit');
 
         await u.waitUntil(() => lview.querySelectorAll(".open-room").length > 1);
         room_els = lview.querySelectorAll(".open-room");
@@ -283,7 +283,7 @@ describe("A groupchat shown in the groupchats list", function () {
         await mock.waitForRoster(_converse, 'current', 0);
         const muc_jid = 'lounge@conference.shakespeare.lit';
         _converse.api.rooms.open(muc_jid, { nick: 'romeo' });
-        await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
+        await mock.waitForMUCDiscoInfo(_converse, muc_jid);
 
         await u.waitUntil(() => _converse.chatboxes.length === 2);
 

src/shared/tests/mock.js

@@ -215,7 +215,7 @@ async function openChatBoxFor (_converse, jid) {
     return u.waitUntil(() => _converse.chatboxviews.get(jid), 1000);
 }
 
-async function waitOnDiscoInfoForNewMUC(_converse, muc_jid) {
+async function waitForNewMUCDiscoInfo(_converse, muc_jid) {
     const { api } = _converse;
     const connection = api.connection.get();
     const own_jid = connection.jid;
@@ -238,7 +238,7 @@ async function waitOnDiscoInfoForNewMUC(_converse, muc_jid) {
     _converse.api.connection.get()._dataRecv(mock.createRequest(features_stanza));
 }
 
-async function waitForMUCDiscoFeatures (_converse, muc_jid, features=[], settings={}) {
+async function waitForMUCDiscoInfo (_converse, muc_jid, features=[], settings={}) {
     const room = Strophe.getNodeFromJid(muc_jid);
     muc_jid = muc_jid.toLowerCase();
     const stanzas = _converse.api.connection.get().IQ_stanzas;
@@ -412,7 +412,7 @@ async function openAndEnterMUC (
     muc_jid = muc_jid.toLowerCase();
 
     const room_creation_promise = api.rooms.open(muc_jid, settings, force_open);
-    await waitForMUCDiscoFeatures(_converse, muc_jid, features, settings);
+    await waitForMUCDiscoInfo(_converse, muc_jid, features, settings);
     await waitForReservedNick(_converse, muc_jid, nick);
     // The user has just entered the room (because join was called)
     // and receives their own presence from the server.
@@ -900,10 +900,10 @@ Object.assign(mock, {
     sendMessage,
     toggleControlBox,
     view_mode,
-    waitForMUCDiscoFeatures,
+    waitForMUCDiscoInfo,
+    waitForNewMUCDiscoInfo,
     waitForReservedNick,
     waitForRoster,
-    waitOnDiscoInfoForNewMUC,
     waitUntilBlocklistInitialized,
     waitUntilBookmarksReturned,
     waitUntilDiscoConfirmed