Rename openAndEnterChatRoom to openAndEnterMUC

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

@@ -13,7 +13,7 @@ describe("A bookmark", function () {
         const nick = 'JC';
         const muc_jid = 'theplay@conference.shakespeare.lit';
         const settings = { name: "Play's the thing", password: 'secret' };
-        const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true, settings);
+        const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true, settings);
 
         const IQ_stanzas = _converse.api.connection.get().IQ_stanzas;
         const sent_stanza = await u.waitUntil(
@@ -76,7 +76,7 @@ describe("A bookmark", function () {
         const nick = 'JC';
         const muc_jid = 'theplay@conference.shakespeare.lit';
         const settings = { name: "Play's the thing", password: 'secret' };
-        const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true, settings);
+        const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true, settings);
 
         const IQ_stanzas = _converse.api.connection.get().IQ_stanzas;
         let sent_stanza = await u.waitUntil(
@@ -230,7 +230,7 @@ describe("A bookmark", function () {
             const nick = 'romeo';
             const muc_jid = 'theplay@conference.shakespeare.lit';
             const settings = { name:  'The Play' };
-            const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true, settings);
+            const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true, settings);
 
             const { bookmarks } = _converse.state;
             await u.waitUntil(() => bookmarks.length);

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

@@ -16,7 +16,7 @@ describe("A chat room", function () {
         const nick = 'JC';
         const muc_jid = 'theplay@conference.shakespeare.lit';
         const settings = { name: "Play's the thing", password: 'secret' };
-        const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true, settings);
+        const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true, settings);
 
         const IQ_stanzas = _converse.api.connection.get().IQ_stanzas;
         const sent_stanza = await u.waitUntil(
@@ -93,7 +93,7 @@ describe("A bookmark", function () {
         const nick = 'romeo';
         const muc_jid = 'theplay@conference.shakespeare.lit';
         const settings = { name:  'The Play' };
-        const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true, settings);
+        const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true, settings);
 
         const { bookmarks } = _converse.state;
         await u.waitUntil(() => bookmarks.length);

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

@@ -10,7 +10,7 @@ describe('The MUC Affiliations API', function () {
             const { api } = _converse;
             const user_jid = 'annoyingguy@montague.lit';
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const presence = stx`
                 <presence from="lounge@montague.lit/annoyingGuy"
                         id="27C55F89-1C6A-459A-9EB5-77690145D624"

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

@@ -10,7 +10,7 @@ describe("A MUC message", function () {
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
         const features = [...mock.default_muc_features, Strophe.NS.OCCUPANTID];
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
         const occupant_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@montague.lit';
         const presence = stx`
             <presence from="${muc_jid}/thirdwitch"
@@ -47,7 +47,7 @@ describe("A MUC message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const msg = $msg({
                 from: 'lounge@montague.lit/romeo',
                 id: u.getUniqueId(),
@@ -63,7 +63,7 @@ describe("A MUC message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'room@muc.example.com';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
         model.sendMessage({'body': 'hello world'});
         await u.waitUntil(() => model.messages.length === 1);
@@ -94,7 +94,7 @@ describe("A MUC message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const impersonated_jid = `${muc_jid}/alice`;
         const received_stanza = stx`
             <message to='${_converse.jid}'
@@ -127,7 +127,7 @@ describe("A MUC message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function(_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const received_stanza = stx`
             <message xmlns="jabber:client" to='${_converse.jid}' from='${muc_jid}/mallory' type='groupchat' id='${_converse.api.connection.get().getUniqueId()}' >
                 <reply xmlns='urn:xmpp:reply:0' id='${_converse.api.connection.get().getUniqueId()}' to='${_converse.jid}'/>

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

@@ -12,7 +12,7 @@ describe("Groupchats", function () {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
         // Open a hidden room
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], false, {'hidden': true});
+        await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], false, {'hidden': true});
         const model = _converse.chatboxes.get(muc_jid);
 
         _converse.api.connection.get()._dataRecv(mock.createRequest(stx`
@@ -50,7 +50,7 @@ describe("Groupchats", function () {
             const sent_stanzas = _converse.api.connection.get().sent_stanzas;
             while (sent_stanzas.length) sent_stanzas.pop();
 
-            const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            const muc = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
             let pres = await u.waitUntil(() => sent_stanzas.filter(s => s.nodeName === 'presence').pop());
             expect(pres).toEqualStanza(stx`
@@ -79,7 +79,7 @@ describe("Groupchats", function () {
             while (sent_stanzas.length) sent_stanzas.pop();
 
             const muc2_jid = 'cave@chat.shakespeare.lit';
-            const muc2 = await mock.openAndEnterChatRoom(_converse, muc2_jid, 'romeo');
+            const muc2 = await mock.openAndEnterMUC(_converse, muc2_jid, 'romeo');
 
             pres = await u.waitUntil(() => sent_stanzas.filter(s => s.nodeName === 'presence').pop());
             expect(Strophe.serialize(pres)).toBe(
@@ -98,7 +98,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'coven@chat.shakespeare.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const model = _converse.chatboxes.get(muc_jid);
             expect(model.session.get('connection_status')).toBe(converse.ROOMSTATUS.ENTERED);
             model.sendMessage({'body': 'hello world'});

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

@@ -10,7 +10,7 @@ describe("A MUC occupant", function () {
 
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick);
 
         // See example 21 https://xmpp.org/extensions/xep-0045.html#enter-pres
         const id = u.getUniqueId();
@@ -38,7 +38,7 @@ describe("A MUC occupant", function () {
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
         const features = [...mock.default_muc_features, Strophe.NS.OCCUPANTID];
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
 
         expect(model.occupants.length).toBe(1);
         expect(model.get('occupant_id')).not.toBeFalsy();
@@ -95,7 +95,7 @@ describe("A MUC occupant", function () {
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
         const features = [...mock.default_muc_features, Strophe.NS.OCCUPANTID];
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
 
         expect(model.occupants.length).toBe(1);
         expect(model.get('occupant_id')).not.toBeFalsy();

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

@@ -11,7 +11,7 @@ describe("A Groupchat Message", function () {
             async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         expect(model.ui.get('scrolled')).toBeFalsy();
 
         model.sendMessage({'body': '1st message'});

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

@@ -13,7 +13,7 @@ describe("Groupchats", function () {
 
             const nick = 'romeo';
             const muc_jid = 'coven@chat.shakespeare.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+            await mock.openAndEnterMUC(_converse, muc_jid, nick);
 
             const IQ_stanzas = _converse.api.connection.get().IQ_stanzas;
             let stanza = await u.waitUntil(() => IQ_stanzas.find(
@@ -67,7 +67,7 @@ describe("Groupchats", function () {
                 async function (_converse) {
 
             const muc_jid = 'coven@chat.shakespeare.lit';
-            const room = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            const room = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
             let stanza = await u.waitUntil(() => _converse.api.connection.get().IQ_stanzas.filter(
                 iq => sizzle(`iq[to="${muc_jid}"][type="get"] query[xmlns="jabber:iq:register"]`, iq).length

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

@@ -87,7 +87,7 @@ describe("Message Archive Management", function () {
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
             const muc_jid = 'orchard@chat.shakespeare.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             let view = _converse.chatboxviews.get(muc_jid);
             let iq_get = await u.waitUntil(() => sent_IQs.filter(iq => iq.querySelector(`iq query[xmlns="${Strophe.NS.MAM}"]`)).pop());
             expect(Strophe.serialize(iq_get)).toBe(
@@ -158,7 +158,7 @@ describe("Message Archive Management", function () {
 
             await u.waitUntil(() => _converse.chatboxes.length === 1);
 
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.model.messages.length);
 
@@ -438,7 +438,7 @@ describe("Message Archive Management", function () {
                     ['discoInitialized'], {},
                     async function (_converse) {
 
-                await mock.openAndEnterChatRoom(_converse, 'trek-radio@conference.lightwitch.org', 'romeo');
+                await mock.openAndEnterMUC(_converse, 'trek-radio@conference.lightwitch.org', 'romeo');
 
                 const view = _converse.chatboxviews.get('trek-radio@conference.lightwitch.org');
                 let stanza = u.toStanza(
@@ -485,7 +485,7 @@ describe("Message Archive Management", function () {
                     ['discoInitialized'], {},
                     async function (_converse) {
 
-                await mock.openAndEnterChatRoom(_converse, 'trek-radio@conference.lightwitch.org', 'jcbrand');
+                await mock.openAndEnterMUC(_converse, 'trek-radio@conference.lightwitch.org', 'jcbrand');
                 const view = _converse.chatboxviews.get('trek-radio@conference.lightwitch.org');
                 let stanza = u.toStanza(
                     `<message xmlns="jabber:client" to="jcbrand@lightwitch.org/converse.js-73057452" type="groupchat" from="trek-radio@conference.lightwitch.org/comndrdukath#0805 (STO)">
@@ -523,7 +523,7 @@ describe("Message Archive Management", function () {
                     ['discoInitialized'], {},
                     async function (_converse) {
 
-                await mock.openAndEnterChatRoom(_converse, 'discuss@conference.conversejs.org', 'romeo');
+                await mock.openAndEnterMUC(_converse, 'discuss@conference.conversejs.org', 'romeo');
                 const view = _converse.chatboxviews.get('discuss@conference.conversejs.org');
                 let stanza = u.toStanza(
                     `<message xmlns="jabber:client" to="romeo@montague.lit/orchard" from="discuss@conference.conversejs.org">

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

@@ -46,7 +46,7 @@ describe("Message Archive Management", function () {
                 "msgid": "${msgid}"
             }`);
 
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
 
             let iq_get = await u.waitUntil(() => sent_IQs.filter(iq => iq.querySelector(`iq query[xmlns="${Strophe.NS.MAM}"]`)).pop());
@@ -160,7 +160,7 @@ describe("Message Archive Management", function () {
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
             const muc_jid = 'orchard@chat.shakespeare.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             const iq_get = await u.waitUntil(() => sent_IQs.filter(iq => iq.querySelector(`iq query[xmlns="${Strophe.NS.MAM}"]`)).pop());
 

src/plugins/minimize/tests/minchats.js

@@ -69,7 +69,7 @@ describe("A Groupchat", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         const muc_jid = 'lounge@conference.shakespeare.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         spyOn(_converse.api, "trigger").and.callThrough();
         const button = await u.waitUntil(() => view.querySelector('.toggle-chatbox-button'));
@@ -353,7 +353,7 @@ describe("The Minimized Chats Widget", function () {
 
         const { minimize } = converse.env.u;
         const muc_jid = 'kitchen@conference.shakespeare.lit';
-        await mock.openAndEnterChatRoom(_converse, 'kitchen@conference.shakespeare.lit', 'fires');
+        await mock.openAndEnterMUC(_converse, 'kitchen@conference.shakespeare.lit', 'fires');
         const view = _converse.chatboxviews.get(muc_jid);
         minimize(view.model);
         const message = 'fires: Your attention is required';

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

@@ -8,7 +8,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
         const stanza = stx`
             <presence
@@ -62,7 +62,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const stanza = stx`
             <presence
                 to="romeo@montague.lit/_converse.js-29092160"
@@ -110,7 +110,7 @@ describe("A Groupchat Message", function () {
     it("Cannot be quoted without permission to speak",
             mock.initConverse([], {}, async function (_converse) {
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', ['muc_moderated']);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', ['muc_moderated']);
         const stanza = stx`
             <presence
                 to="romeo@montague.lit/_converse.js-29092160"

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

@@ -8,7 +8,7 @@ describe("The nickname autocomplete feature", function () {
             mock.initConverse(['chatBoxesFetched'], {},
             async function (_converse) {
 
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'tom');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'tom');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         // Nicknames from presences
         ['dick', 'harry'].forEach((nick) => {
@@ -71,7 +71,7 @@ describe("The nickname autocomplete feature", function () {
             mock.initConverse(['chatBoxesFetched'], {},
             async function (_converse) {
 
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'tom');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'tom');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
 
         // Nicknames from presences
@@ -137,7 +137,7 @@ describe("The nickname autocomplete feature", function () {
             ['chatBoxesFetched'], {'opening_mention_characters':['(']},
             async function (_converse) {
 
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'tom');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'tom');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
 
         // Nicknames from presences
@@ -203,7 +203,7 @@ describe("The nickname autocomplete feature", function () {
                 ['chatBoxesFetched'], {}, async function (_converse) {
 
         await mock.waitUntilBookmarksReturned(_converse);
-        const model = await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'tom');
+        const model = await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'tom');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
 
         // Nicknames from presences
@@ -266,7 +266,7 @@ describe("The nickname autocomplete feature", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         await mock.waitUntilBookmarksReturned(_converse);
-        const model = await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         expect(view.model.occupants.length).toBe(1);
         let presence = stx`<presence
@@ -378,7 +378,7 @@ describe("The nickname autocomplete feature", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         await mock.waitUntilBookmarksReturned(_converse);
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         expect(view.model.occupants.length).toBe(1);
         _converse.api.connection.get()._dataRecv(mock.createRequest(

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

@@ -11,7 +11,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             spyOn(window, 'confirm').and.callFake(() => true);
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
             const enter = { 'target': textarea, 'preventDefault': function preventDefault () {}, 'keyCode': 13 };
@@ -107,7 +107,7 @@ describe("Groupchats", function () {
         it("takes /help to show the available commands and commands can be disabled by config",
                 mock.initConverse([], {muc_disable_slash_commands: ['mute', 'voice']}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
             const enter = { 'target': textarea, 'preventDefault': function () {}, 'keyCode': 13 };
@@ -146,7 +146,7 @@ describe("Groupchats", function () {
             let iq_stanza;
             const nick = 'romeo';
             const muc_jid = 'lounge@muc.montague.lit';
-            const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+            const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick);
 
             /* We don't show join/leave messages for existing occupants. We
              * know about them because we receive their presences before we
@@ -286,7 +286,7 @@ describe("Groupchats", function () {
         }));
 
         it("takes /topic to set the groupchat topic", mock.initConverse([], {}, async function (_converse) {
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             // Check the alias /topic
             const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
@@ -345,7 +345,7 @@ describe("Groupchats", function () {
         }));
 
         it("takes /clear to clear messages", mock.initConverse([], {}, async function (_converse) {
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
             textarea.value = '/clear';
@@ -368,7 +368,7 @@ describe("Groupchats", function () {
                 IQ_id = sendIQ.bind(this)(iq, callback, errback);
             });
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             spyOn(view.model, 'validateRoleOrAffiliationChangeArgs').and.callThrough();
 
@@ -453,7 +453,7 @@ describe("Groupchats", function () {
                 IQ_id = sendIQ.bind(this)(iq, callback, errback);
             });
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             spyOn(view.model, 'validateRoleOrAffiliationChangeArgs').and.callThrough();
 
@@ -549,7 +549,7 @@ describe("Groupchats", function () {
             });
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             spyOn(view.model, 'setRole').and.callThrough();
             spyOn(view.model, 'validateRoleOrAffiliationChangeArgs').and.callThrough();
@@ -621,7 +621,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             let sent_IQ, IQ_id;
             const sendIQ = _converse.api.connection.get().sendIQ;
@@ -738,7 +738,7 @@ describe("Groupchats", function () {
             mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             var sent_IQ, IQ_id;
             var sendIQ = _converse.api.connection.get().sendIQ;
@@ -858,7 +858,7 @@ describe("Groupchats", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const new_muc_jid = 'foyer@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             let view = _converse.chatboxviews.get(muc_jid);
             spyOn(_converse.api, 'confirm').and.callThrough();
             let textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
@@ -910,7 +910,7 @@ describe("Groupchats", function () {
             // Try again without reason or new JID
             _converse.api.connection.get().IQ_stanzas = [];
             sent_IQs = _converse.api.connection.get().IQ_stanzas;
-            await mock.openAndEnterChatRoom(_converse, new_muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, new_muc_jid, 'romeo');
             view = _converse.chatboxviews.get(new_muc_jid);
             textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
             textarea.value = '/destroy';

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

@@ -10,7 +10,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         _converse.api.connection.get()._dataRecv(mock.createRequest(stx`
             <presence
                 to="romeo@montague.lit/_converse.js-29092160"
@@ -83,7 +83,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         _converse.api.connection.get()._dataRecv(mock.createRequest(stx`
             <presence
@@ -179,7 +179,7 @@ describe("A Groupchat Message", function () {
         const { jid: own_jid } = api.connection.get();
         const nick = 'romeo'
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
         const textarea = await u.waitUntil(() => view.querySelector('textarea.chat-textarea'));
         expect(textarea.value).toBe('');
@@ -288,7 +288,7 @@ describe('A Groupchat Message XEP-0308 correction ', function () {
         mock.initConverse([], {}, async function (_converse) {
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.OCCUPANTID];
-            const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const msg_id = u.getUniqueId();
             await model.handleMessageStanza(
@@ -368,7 +368,7 @@ describe('A Groupchat Message XEP-0308 correction ', function () {
             const nick = 'romeo';
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.OCCUPANTID];
-            const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+            const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
 
             expect(model.get('occupant_id')).toBe(model.occupants.at(0).get('occupant_id'));
 

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

@@ -23,7 +23,7 @@ describe("Groupchats", function () {
                 'muc_moderated',
                 'muc_anonymous'
             ]
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const view = _converse.chatboxviews.get(muc_jid);
             view.model.setChatState(_converse.ACTIVE);
@@ -69,7 +69,7 @@ describe("Groupchats", function () {
                     {'affiliation': 'member', 'nick': 'majortom', 'jid': 'majortom@example.org'},
                     {'affiliation': 'admin', 'nick': 'groundcontrol', 'jid': 'groundcontrol@example.org'}
                 ];
-                await mock.openAndEnterChatRoom(_converse, muc_jid, 'some1', [], members);
+                await mock.openAndEnterMUC(_converse, muc_jid, 'some1', [], members);
                 const view = _converse.chatboxviews.get(muc_jid);
 
                 let csntext = await u.waitUntil(() => view.querySelector('.chat-content__notifications').textContent);
@@ -181,7 +181,7 @@ describe("Groupchats", function () {
 
             it("will be shown if received", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
                 const muc_jid = 'coven@chat.shakespeare.lit';
-                await mock.openAndEnterChatRoom(_converse, muc_jid, 'some1');
+                await mock.openAndEnterMUC(_converse, muc_jid, 'some1');
                 const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
 
                 /* <presence to="romeo@montague.lit/_converse.js-29092160"

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

@@ -11,7 +11,7 @@ describe("Deprecated Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE0];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const received_stanza = stx`
                 <message to="${_converse.jid}"
@@ -61,7 +61,7 @@ describe("Deprecated Message Retractions", function () {
             const date = (new Date()).toISOString();
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE0];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const retraction_stanza = stx`
                 <message type="groupchat"
@@ -122,7 +122,7 @@ describe("Deprecated Message Retractions", function () {
             const date = (new Date()).toISOString();
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE0];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const retraction_stanza = stx`
                 <message xmlns="jabber:client" from="${muc_jid}" type="groupchat" id="retraction-id-1">
                     <apply-to xmlns="urn:xmpp:fasten:0" id="stanza-id-1">
@@ -296,7 +296,7 @@ describe("Deprecated Message Retractions", function () {
         it("can be followed up by a retraction by the author", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE0];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const received_stanza = stx`
             <message to="${_converse.jid}"
@@ -341,7 +341,7 @@ describe("Deprecated Message Retractions", function () {
                 mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -461,7 +461,7 @@ describe("Deprecated Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE0];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
@@ -538,7 +538,7 @@ describe("Deprecated Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE0];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;

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

@@ -12,7 +12,7 @@ describe("Emojis", function () {
 
             await mock.waitForRoster(_converse, 'current', 0);
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.querySelector('converse-emoji-picker'));
             const textarea = view.querySelector('textarea.chat-textarea');
@@ -78,7 +78,7 @@ describe("Emojis", function () {
 
             const muc_jid = 'lounge@montague.lit';
             await mock.waitForRoster(_converse, 'current', 0);
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.querySelector('converse-emoji-picker'));
             const textarea = view.querySelector('textarea.chat-textarea');
@@ -127,7 +127,7 @@ describe("Emojis", function () {
 
             const muc_jid = 'lounge@montague.lit';
             await mock.waitForRoster(_converse, 'current', 0);
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.querySelector('converse-emoji-picker'));
             const textarea = view.querySelector('textarea.chat-textarea');
@@ -171,7 +171,7 @@ describe("Emojis", function () {
 
             const muc_jid = 'lounge@montague.lit';
             await mock.waitForRoster(_converse, 'current', 0);
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.querySelector('converse-emoji-dropdown'));
             const toolbar = view.querySelector('converse-chat-toolbar');

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

@@ -7,7 +7,7 @@ describe("A XEP-0317 MUC Hat", function () {
     it("can be included in a presence stanza",
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
 
 

src/plugins/muc-views/tests/http-file-upload.js

@@ -11,7 +11,7 @@ describe("XEP-0363: HTTP File Upload", function () {
         describe("A file upload toolbar button", function () {
 
             it("does not appear in MUC chats", mock.initConverse([], {}, async (_converse) => {
-                await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+                await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
                 mock.waitUntilDiscoConfirmed(
                     _converse, _converse.domain,
                     [{'category': 'server', 'type':'IM'}],
@@ -38,7 +38,7 @@ describe("XEP-0363: HTTP File Upload", function () {
 
                 await mock.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.lit'], 'items');
                 await mock.waitUntilDiscoConfirmed(_converse, 'upload.montague.lit', [], [Strophe.NS.HTTPUPLOAD], []);
-                await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+                await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
                 await u.waitUntil(() => _converse.chatboxviews.get('lounge@montague.lit').querySelector('.fileupload'));
                 const view = _converse.chatboxviews.get('lounge@montague.lit');
                 expect(view.querySelector('.chat-toolbar .fileupload')).not.toBe(null);
@@ -60,7 +60,7 @@ describe("XEP-0363: HTTP File Upload", function () {
                     const nick = 'romeo';
                     await mock.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.tld'], 'items');
                     await mock.waitUntilDiscoConfirmed(_converse, 'upload.montague.tld', [], [Strophe.NS.HTTPUPLOAD], []);
-                    await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+                    await mock.openAndEnterMUC(_converse, muc_jid, nick);
 
                     // Wait until MAM query has been sent out
                     const sent_stanzas = _converse.api.connection.get().sent_stanzas;

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

@@ -8,7 +8,7 @@ describe("an info message", function () {
 
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
         let presence = stx`
             <presence xmlns="jabber:client" to="${_converse.jid}" from="${muc_jid}/romeo">
@@ -41,7 +41,7 @@ describe("an info message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         const presence = stx`
             <presence xmlns="jabber:client" to="${_converse.jid}" from="${muc_jid}/romeo">

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

@@ -10,7 +10,7 @@ describe("A MAM archived message", function () {
 
         const nick = 'romeo';
         const muc_jid = 'room@muc.example.com';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick);
 
         const messages = [
             stx`<message to="${_converse.api.connection.get().jid}" from="${muc_jid}" xmlns="jabber:server">
@@ -90,7 +90,7 @@ describe("A MAM archived message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'room@muc.example.com';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         spyOn(model, 'getDuplicateMessage').and.callThrough();
         let stanza = stx`
             <message xmlns="jabber:client"
@@ -139,7 +139,7 @@ describe("A MAM archived message", function () {
         const muc_jid = 'xsf@muc.xmpp.org';
         const sender_jid = `${muc_jid}/romeo`;
         const impersonated_jid = `${muc_jid}/i_am_groot`
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         _converse.api.connection.get()._dataRecv(mock.createRequest(
             stx`<presence to='romeo@montague.lit/_converse.js-29092160' from='${sender_jid}' xmlns="jabber:client">
                     <x xmlns='${Strophe.NS.MUC_USER}'>

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

@@ -10,7 +10,7 @@ describe("A XEP-0333 Chat Marker", function () {
 
         await mock.waitForRoster(_converse, 'current');
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
         textarea.value = 'But soft, what light through yonder airlock breaks?';

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

@@ -10,7 +10,7 @@ describe("A Groupchat Message", function () {
         await mock.waitUntilDiscoConfirmed(_converse, 'montague.lit', [], ['vcard-temp']);
         await u.waitUntil(() => _converse.xmppstatus.vcard.get('fullname'));
         await mock.waitForRoster(_converse, 'current');
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         if (!view.querySelectorAll('.chat-area').length) {
             view.renderChatArea();

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

@@ -11,7 +11,7 @@ describe("A Groupchat", function () {
             const { api } = _converse;
             let sent_IQs = _converse.api.connection.get().IQ_stanzas;
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             let view = _converse.chatboxviews.get(muc_jid);
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation]')).length).toBe(3);
 
@@ -39,7 +39,7 @@ describe("A Groupchat", function () {
             _converse.api.connection.get().IQ_stanzas = [];
             sent_IQs = _converse.api.connection.get().IQ_stanzas;
             api.settings.set('muc_fetch_members', false);
-            await mock.openAndEnterChatRoom(_converse, 'orchard@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'orchard@montague.lit', 'romeo');
             view = _converse.chatboxviews.get('orchard@montague.lit');
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation]')).length).toBe(0);
             await view.close();
@@ -47,7 +47,7 @@ describe("A Groupchat", function () {
             _converse.api.connection.get().IQ_stanzas = [];
             sent_IQs = _converse.api.connection.get().IQ_stanzas;
             api.settings.set('muc_fetch_members', ['admin']);
-            await mock.openAndEnterChatRoom(_converse, 'courtyard@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'courtyard@montague.lit', 'romeo');
             view = _converse.chatboxviews.get('courtyard@montague.lit');
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation]')).length).toBe(1);
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation="admin"]')).length).toBe(1);
@@ -56,7 +56,7 @@ describe("A Groupchat", function () {
             _converse.api.connection.get().IQ_stanzas = [];
             sent_IQs = _converse.api.connection.get().IQ_stanzas;
             api.settings.set('muc_fetch_members', ['owner']);
-            await mock.openAndEnterChatRoom(_converse, 'garden@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'garden@montague.lit', 'romeo');
             view = _converse.chatboxviews.get('garden@montague.lit');
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation]')).length).toBe(1);
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation="owner"]')).length).toBe(1);
@@ -70,7 +70,7 @@ describe("A Groupchat", function () {
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
             spyOn(_converse.exports.MUCOccupants.prototype, 'fetchMembers').and.callThrough();
             // Join MUC without an affiliation
-            const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], [], true, {}, 'none', 'participant');
+            const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], [], true, {}, 'none', 'participant');
             await u.waitUntil(() => model.occupants.fetchMembers.calls.count());
             expect(sent_IQs.filter(iq => iq.querySelector('query item[affiliation]')).length).toBe(0);
         }));

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

@@ -9,7 +9,7 @@ describe("An incoming groupchat message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         if (!view.querySelectorAll('.chat-area').length) { view.renderChatArea(); }
         const message = 'romeo: Your attention is required';
@@ -31,7 +31,7 @@ describe("An incoming groupchat message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'tom');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'tom');
         const view = _converse.chatboxviews.get(muc_jid);
         ['z3r0', 'mr.robot', 'gibson', 'sw0rdf1sh'].forEach((nick) => {
             _converse.api.connection.get()._dataRecv(mock.createRequest(
@@ -88,7 +88,7 @@ describe("An incoming groupchat message", function () {
         const { jid: own_jid } = api.connection.get();
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
-        const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
         api.connection.get()._dataRecv(mock.createRequest(
             stx`<presence
@@ -136,7 +136,7 @@ describe("An incoming groupchat message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'tom');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'tom');
         const view = _converse.chatboxviews.get(muc_jid);
         ['z3r0', 'mr.robot', 'gibson', 'sw0rdf1sh'].forEach((nick) => {
             _converse.api.connection.get()._dataRecv(mock.createRequest(
@@ -197,7 +197,7 @@ describe("A sent groupchat message", function () {
                 'muc_unmoderated',
                 'muc_nonanonymous'
             ];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'tom', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'tom', features);
             const view = _converse.chatboxviews.get(muc_jid);
             ['z3r0', 'mr.robot', 'gibson', 'sw0rdf1sh', 'Link Mauve', 'robot'].forEach((nick) => {
                 _converse.api.connection.get()._dataRecv(mock.createRequest(
@@ -310,7 +310,7 @@ describe("A sent groupchat message", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'tom');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'tom');
             const view = _converse.chatboxviews.get(muc_jid);
             ['NotAnAdress', 'darnuria'].forEach((nick) => {
                 _converse.api.connection.get()._dataRecv(mock.createRequest(
@@ -342,7 +342,7 @@ describe("A sent groupchat message", function () {
             const { jid: own_jid } = api.connection.get();
             const nick = 'tom';
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+            await mock.openAndEnterMUC(_converse, muc_jid, nick);
             const view = _converse.chatboxviews.get(muc_jid);
             _converse.api.connection.get()._dataRecv(mock.createRequest(
                 stx`<presence
@@ -400,7 +400,7 @@ describe("A sent groupchat message", function () {
                 'muc_unmoderated',
                 'muc_nonanonymous'
             ];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'tom', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'tom', features);
             const view = _converse.chatboxviews.get(muc_jid);
             ['z3r0', 'mr.robot', 'gibson', 'sw0rdf1sh'].forEach((nick) => {
                 _converse.api.connection.get()._dataRecv(mock.createRequest(
@@ -486,7 +486,7 @@ describe("A sent groupchat message", function () {
             const { jid: own_jid } = api.connection.get();
             const nick = 'romeo';
             const muc_jid = 'lounge@montague.lit';
-            const muc = await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+            const muc = await mock.openAndEnterMUC(_converse, muc_jid, nick);
             const view = _converse.chatboxviews.get(muc_jid);
 
             ['z3r0', 'mr.robot', 'gibson', 'sw0rdf1sh'].forEach((nick) => {
@@ -537,7 +537,7 @@ describe("A sent groupchat message", function () {
 
         const members = [{'jid': 'gibson@gibson.net', 'nick': 'gibson', 'affiliation': 'member'}];
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'tom', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'tom', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
         textarea.value = "Welcome @gibson 💩 We have a guide on how to do that here: https://conversejs.org/docs/html/index.html";

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

@@ -9,7 +9,7 @@ describe("A XEP-0316 MEP notification", function () {
 
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
         let msg = 'An anonymous user has saluted romeo';
         let reason = 'Thank you for helping me yesterday';
@@ -97,7 +97,7 @@ describe("A XEP-0316 MEP notification", function () {
 
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true, {'hidden': true});
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true, {'hidden': true});
         const msg = 'An anonymous user has saluted romeo';
         const reason = 'Thank you for helping me yesterday';
         const message = stx`
@@ -136,7 +136,7 @@ describe("A XEP-0316 MEP notification", function () {
     it("renders URLs as links", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], [], true);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, [], [], true);
         const msg = 'An anonymous user has waved at romeo';
         const reason = 'Check out https://conversejs.org';
         const message = stx`
@@ -176,7 +176,7 @@ describe("A XEP-0316 MEP notification", function () {
         const muc_jid = 'lounge@montague.lit';
         const nick = 'romeo';
         const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
         const view = _converse.chatboxviews.get(muc_jid);
         const msg = 'An anonymous user has saluted romeo';
         const reason = 'Thank you for helping me yesterday';

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

@@ -27,7 +27,7 @@ describe("The groupchat moderator tool", function () {
             {'jid': 'crone1@shakespeare.lit', 'nick': 'thirdwitch', 'affiliation': 'owner'},
             {'jid': 'romeo@montague.lit', 'nick': 'romeo', 'affiliation': 'owner'},
         ];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => (view.model.occupants.length === 5), 1000);
 
@@ -149,7 +149,7 @@ describe("The groupchat moderator tool", function () {
             {'jid': 'romeo@montague.lit', 'nick': 'romeo', 'affiliation': 'member'},
             {'jid': 'juliet@capulet.lit', 'nick': 'juliet', 'affiliation': 'member'},
         ];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => (view.model.occupants.length === 6), 1000);
 
@@ -192,7 +192,7 @@ describe("The groupchat moderator tool", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', []);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', []);
         const view = _converse.chatboxviews.get(muc_jid);
         _converse.api.connection.get()._dataRecv(mock.createRequest(
             stx`<presence to="${_converse.jid}" from="${muc_jid}/nomorenicks" xmlns="jabber:client">
@@ -292,7 +292,7 @@ describe("The groupchat moderator tool", function () {
             {'jid': 'crone1@shakespeare.lit', 'nick': 'thirdwitch', 'affiliation': 'owner'},
             {'jid': 'romeo@montague.lit', 'nick': 'romeo', 'affiliation': 'owner'},
         ];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => (view.model.occupants.length === 5));
         const modal = await openModtools(_converse, view);
@@ -343,7 +343,7 @@ describe("The groupchat moderator tool", function () {
             {'jid': 'gower@shakespeare.lit', 'nick': 'gower', 'affiliation': 'member'},
             {'jid': 'romeo@montague.lit', 'nick': 'romeo', 'affiliation': 'owner'},
         ];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => (view.model.occupants.length === 2));
         const modal = await openModtools(_converse, view);
@@ -409,7 +409,7 @@ describe("The groupchat moderator tool", function () {
             {'jid': 'gower@shakespeare.lit', 'nick': 'gower', 'affiliation': 'member'},
             {'jid': 'romeo@montague.lit', 'nick': 'romeo', 'affiliation': 'admin'},
         ];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => (view.model.occupants.length === 3));
         const modal = await openModtools(_converse, view);
@@ -438,7 +438,7 @@ describe("The groupchat moderator tool", function () {
 
         const muc_jid = 'lounge@montague.lit';
         const members = [{'jid': 'romeo@montague.lit', 'nick': 'romeo', 'affiliation': 'owner'}];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
         textarea.value = '/modtools';

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

@@ -10,15 +10,15 @@ describe("Groupchats", function () {
         it("has a method 'close' which closes rooms by JID or all rooms when called with no arguments",
                 mock.initConverse([], {}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
 
             const { api } = _converse;
             const connection = api.connection.get();
             connection.IQ_stanzas = [];
-            await mock.openAndEnterChatRoom(_converse, 'leisure@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'leisure@montague.lit', 'romeo');
 
             connection.IQ_stanzas = [];
-            await mock.openAndEnterChatRoom(_converse, 'news@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'news@montague.lit', 'romeo');
 
             expect(u.isVisible(_converse.chatboxviews.get('lounge@montague.lit'))).toBeTruthy();
             expect(u.isVisible(_converse.chatboxviews.get('leisure@montague.lit'))).toBeTruthy();
@@ -39,8 +39,8 @@ describe("Groupchats", function () {
             expect(_converse.chatboxviews.get('leisure@montague.lit')).toBeUndefined();
             expect(_converse.chatboxviews.get('news@montague.lit')).toBeUndefined();
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
-            await mock.openAndEnterChatRoom(_converse, 'leisure@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'leisure@montague.lit', 'romeo');
             expect(u.isVisible(_converse.chatboxviews.get('lounge@montague.lit'))).toBeTruthy();
             expect(u.isVisible(_converse.chatboxviews.get('leisure@montague.lit'))).toBeTruthy();
 
@@ -63,7 +63,7 @@ describe("Groupchats", function () {
             const rosterview = document.querySelector('converse-roster');
             await u.waitUntil(() => rosterview.querySelectorAll('.roster-group .group-toggle').length, 300);
             let muc_jid = 'chillout@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             let room = await _converse.api.rooms.get(muc_jid);
             expect(room instanceof Object).toBeTruthy();
 
@@ -75,7 +75,7 @@ describe("Groupchats", function () {
 
             // Test with mixed case
             muc_jid = 'Leisure@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             room = await _converse.api.rooms.get(muc_jid);
             expect(room instanceof Object).toBeTruthy();
             chatroomview = _converse.chatboxviews.get(muc_jid.toLowerCase());

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

@@ -8,7 +8,7 @@ describe('Groupchats', () => {
             'has an avatar image',
             mock.initConverse(['chatBoxesFetched'], { vcard: { nickname: '' } }, async function (_converse) {
                 const muc_jid = 'lounge@montague.lit';
-                await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+                await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
                 const view = _converse.chatboxviews.get(muc_jid);
                 const avatar = view.querySelector('.chat-head converse-avatar .avatar-initials');

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

@@ -14,7 +14,7 @@ describe("A Groupchat Message", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
             textarea.value = 'hello world'
@@ -54,7 +54,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         if (!view.querySelectorAll('.chat-area').length) { view.renderChatArea(); }
         const message = 'romeo: Your attention is required';
@@ -77,7 +77,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         if (!view.querySelectorAll('.chat-area').length) { view.renderChatArea(); }
         const id = u.getUniqueId();
@@ -109,7 +109,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'room@muc.example.com';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         spyOn(view.model, 'getStanzaIdQueryAttrs').and.callThrough();
         let stanza = stx`
@@ -154,7 +154,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse([], {}, async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         let msg = stx`
             <message xmlns="jabber:client"
@@ -297,7 +297,7 @@ describe("A Groupchat Message", function () {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
         const features = [...mock.default_muc_features, Strophe.NS.OCCUPANTID];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
         const view = _converse.chatboxviews.get(muc_jid);
         const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
         textarea.value = 'But soft, what light through yonder airlock breaks?';
@@ -340,7 +340,7 @@ describe("A Groupchat Message", function () {
 
         await mock.waitForRoster(_converse, 'current');
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
         textarea.value = 'But soft, what light through yonder airlock breaks?';

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

@@ -18,7 +18,7 @@ describe('MUC Private Messages', () => {
                     affiliation: 'member',
                 },
             ];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], members);
+            await mock.openAndEnterMUC(_converse, muc_jid, nick, [], members);
 
             const view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.model.occupants.length === 2);
@@ -36,7 +36,7 @@ describe('MUC Private Messages', () => {
             mock.initConverse(['chatBoxesFetched'], { view_mode: 'fullscreen' }, async (_converse) => {
                 const nick = 'romeo';
                 const muc_jid = 'coven@chat.shakespeare.lit';
-                await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+                await mock.openAndEnterMUC(_converse, muc_jid, nick);
                 const view = _converse.chatboxviews.get(muc_jid);
 
                 _converse.api.connection.get()._dataRecv(
@@ -98,7 +98,7 @@ describe('MUC Private Messages', () => {
                 const { api } = _converse;
                 const nick = 'romeo';
                 const muc_jid = 'coven@chat.shakespeare.lit';
-                await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+                await mock.openAndEnterMUC(_converse, muc_jid, nick);
                 const view = _converse.chatboxviews.get(muc_jid);
 
                 _converse.api.connection.get()._dataRecv(
@@ -150,7 +150,7 @@ describe('MUC Private Messages', () => {
                 const { api } = _converse;
                 const nick = 'romeo';
                 const muc_jid = 'coven@chat.shakespeare.lit';
-                await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+                await mock.openAndEnterMUC(_converse, muc_jid, nick);
                 const view = _converse.chatboxviews.get(muc_jid);
 
                 _converse.api.connection.get()._dataRecv(
@@ -191,7 +191,7 @@ describe('MUC Private Messages', () => {
                     const { api } = _converse;
                     const nick = 'romeo';
                     const muc_jid = 'coven@chat.shakespeare.lit';
-                    await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+                    await mock.openAndEnterMUC(_converse, muc_jid, nick);
                     const view = _converse.chatboxviews.get(muc_jid);
 
                     _converse.api.connection.get()._dataRecv(

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

@@ -11,7 +11,7 @@ describe("Chatrooms", function () {
                 async function (_converse) {
 
             const muc_jid = 'coven@chat.shakespeare.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo')
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo')
             const view = _converse.chatboxviews.get(muc_jid);
             const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
             textarea.value = '/register';

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

@@ -169,7 +169,7 @@ describe("Groupchats", function () {
             const nick = 'romeo';
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
             const muc_jid = 'lounge@montague.lit'
-            await mock.openAndEnterChatRoom(_converse, muc_jid, nick, [], []);
+            await mock.openAndEnterMUC(_converse, muc_jid, nick, [], []);
             const view = _converse.chatboxviews.get(muc_jid);
             let iq_get = await u.waitUntil(() => sent_IQs.filter(iq => iq.querySelector(`iq query[xmlns="${Strophe.NS.MAM}"]`)).pop());
             const first_msg_id = _converse.api.connection.get().getUniqueId();
@@ -263,7 +263,7 @@ describe("Groupchats", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             const message = stx`
                 <message xmlns="jabber:client" type="groupchat" id="918172de-d5c5-4da4-b388-446ef4a05bec" to="${_converse.jid}" xml:lang="en" from="${muc_jid}/juliet">
@@ -288,7 +288,7 @@ describe("Groupchats", function () {
         describe("topic", function () {
 
             it("is shown the header", mock.initConverse([], {}, async function (_converse) {
-                await mock.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'jc');
+                await mock.openAndEnterMUC(_converse, 'jdev@conference.jabber.org', 'jc');
                 const text = 'Jabber/XMPP Development | RFCs and Extensions: https://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org';
                 let stanza = stx`
                     <message xmlns="jabber:client" to="${_converse.jid}" type="groupchat" from="jdev@conference.jabber.org/ralphm">
@@ -316,7 +316,7 @@ describe("Groupchats", function () {
             }));
 
             it("can be toggled by the user", mock.initConverse([], {}, async function (_converse) {
-                await mock.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'jc');
+                await mock.openAndEnterMUC(_converse, 'jdev@conference.jabber.org', 'jc');
                 const text = 'Jabber/XMPP Development | RFCs and Extensions: https://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org';
                 let stanza = stx`
                     <message xmlns="jabber:client" to="${_converse.jid}" type="groupchat" from="jdev@conference.jabber.org/ralphm">
@@ -353,7 +353,7 @@ describe("Groupchats", function () {
             }));
 
             it("will always be shown when it's new", mock.initConverse([], {}, async function (_converse) {
-                await mock.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'jc');
+                await mock.openAndEnterMUC(_converse, 'jdev@conference.jabber.org', 'jc');
                 const text = 'Jabber/XMPP Development | RFCs and Extensions: https://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org';
                 let stanza = stx`<message xmlns="jabber:client" to="${_converse.jid}" type="groupchat" from="jdev@conference.jabber.org/ralphm">
                         <subject>${text}</subject>
@@ -386,7 +386,7 @@ describe("Groupchats", function () {
 
             it("causes an info message to be shown when received in real-time", mock.initConverse([], {}, async function (_converse) {
                 spyOn(_converse.ChatRoom.prototype, 'handleSubjectChange').and.callThrough();
-                await mock.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'romeo');
+                await mock.openAndEnterMUC(_converse, 'jdev@conference.jabber.org', 'romeo');
                 const view = _converse.chatboxviews.get('jdev@conference.jabber.org');
 
                 _converse.api.connection.get()._dataRecv(mock.createRequest(stx`
@@ -449,7 +449,7 @@ describe("Groupchats", function () {
                 async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid , 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid , 'romeo');
             const model = _converse.chatboxes.get(muc_jid);
             const message = 'Hello world';
             const nick = mock.chatroom_names[0];
@@ -468,7 +468,7 @@ describe("Groupchats", function () {
             await u.waitUntil(() => !document.querySelector('converse-chat-message'));
 
             _converse.api.connection.get().IQ_stanzas = [];
-            await mock.openAndEnterChatRoom(_converse, muc_jid , 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid , 'romeo');
             await u.waitUntil(() => document.querySelector('converse-chat-message'));
             expect(model.messages.length).toBe(1);
             expect(document.querySelectorAll('converse-chat-message').length).toBe(1);
@@ -478,7 +478,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {'clear_messages_on_reconnection': true}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid , 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid , 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             const message = 'Hello world';
             const nick = mock.chatroom_names[0];
@@ -495,7 +495,7 @@ describe("Groupchats", function () {
             await view.model.close();
 
             _converse.api.connection.get().IQ_stanzas = [];
-            await mock.openAndEnterChatRoom(_converse, muc_jid , 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid , 'romeo');
             expect(view.model.messages.length).toBe(0);
             expect(view.querySelector('converse-chat-history')).toBe(null);
         }));
@@ -504,7 +504,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             await mock.waitForRoster(_converse, 'current');
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             if (!view.querySelectorAll('.chat-area').length) {
                 view.renderChatArea();
@@ -839,7 +839,7 @@ describe("Groupchats", function () {
         it("combines subsequent join/leave messages when users enter or exit a groupchat",
                 mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo')
+            await mock.openAndEnterMUC(_converse, 'coven@chat.shakespeare.lit', 'romeo')
             const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
             await u.waitUntil(() => view.querySelector('.chat-content__notifications').textContent.trim() === "romeo has entered the groupchat");
 
@@ -964,7 +964,7 @@ describe("Groupchats", function () {
 
             spyOn(_converse.ChatRoom.prototype, 'onOccupantAdded').and.callThrough();
             spyOn(_converse.ChatRoom.prototype, 'onOccupantRemoved').and.callThrough();
-            await mock.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'some1');
+            await mock.openAndEnterMUC(_converse, 'coven@chat.shakespeare.lit', 'some1');
             const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
             let presence = $pres({
                     to: 'romeo@montague.lit/orchard',
@@ -1001,7 +1001,7 @@ describe("Groupchats", function () {
 
             // See https://github.com/conversejs/converse.js/issues/1259
 
-            await mock.openAndEnterChatRoom(_converse, 'conversations@conference.siacs.eu', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'conversations@conference.siacs.eu', 'romeo');
 
             const presence =
                 stx`<presence to='romeo@montague.lit/orchard'
@@ -1286,7 +1286,7 @@ describe("Groupchats", function () {
                 'muc_anonymous',
                 'vcard-temp',
             ]
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'some1', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'some1', features);
             const view = await u.waitUntil(() => _converse.chatboxviews.get(muc_jid));
             await u.waitUntil(() => u.isVisible(view));
 
@@ -1547,7 +1547,7 @@ describe("Groupchats", function () {
                 'muc_unmoderated',
                 'muc_anonymous'
             ]
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo', features);
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo', features);
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             expect(view.model.getOwnAffiliation()).toBe('owner');
             expect(view.model.features.get('open')).toBe(false);
@@ -1646,7 +1646,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const text = 'This is a received message';
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             spyOn(_converse.api, "trigger").and.callThrough();
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             const nick = mock.chatroom_names[0];
@@ -1672,7 +1672,7 @@ describe("Groupchats", function () {
         }));
 
         it("shows sent groupchat messages", mock.initConverse([], {}, async function (_converse) {
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             spyOn(_converse.api, "trigger").and.callThrough();
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             const text = 'This is a sent message';
@@ -1714,7 +1714,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const message = 'This message is received while the chat area is scrolled up';
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             // Create enough messages so that there's a scrollbar.
             const promises = [];
@@ -1762,7 +1762,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'coven@chat.shakespeare.lit';
-            await mock.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'coven@chat.shakespeare.lit', 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             expect(view.model.session.get('connection_status')).toBe(converse.ROOMSTATUS.ENTERED);
 
@@ -1847,7 +1847,7 @@ describe("Groupchats", function () {
                 'muc_nonanonymous'
             ];
             const muc_jid = 'room@conference.example.org';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
 
             const info_el = view.querySelector(".show-muc-details-modal");
@@ -2053,7 +2053,7 @@ describe("Groupchats", function () {
             spyOn(_converse.api.connection.get(), 'sendIQ').and.callFake(function (iq, callback, errback) {
                 IQ_id = sendIQ.bind(this)(iq, callback, errback);
             });
-            await mock.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'some1');
+            await mock.openAndEnterMUC(_converse, 'coven@chat.shakespeare.lit', 'some1');
 
             const features_stanza =
                 stx`<iq from="coven@chat.shakespeare.lit"
@@ -2088,7 +2088,7 @@ describe("Groupchats", function () {
         it("informs users if they have been kicked out of the groupchat",
                 mock.initConverse([], {}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
             const view = _converse.chatboxviews.get('lounge@montague.lit');
             expect(view.model.session.get('connection_status')).toBe(converse.ROOMSTATUS.ENTERED);
 
@@ -2126,7 +2126,7 @@ describe("Groupchats", function () {
         it("informs users if they have exited the groupchat due to a technical reason",
                 mock.initConverse([], {}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
 
             const presence =
                     stx`<presence from='lounge@montague.lit/romeo'
@@ -2161,7 +2161,7 @@ describe("Groupchats", function () {
 
             const { api } = _converse;
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
             // We instantiate a new ChatBoxes collection, which by default
             // will be empty.
@@ -2189,7 +2189,7 @@ describe("Groupchats", function () {
                 mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             spyOn(model, 'close').and.callThrough();
             spyOn(_converse.api, "trigger").and.callThrough();
             spyOn(model, 'leave');
@@ -2207,7 +2207,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             let presence =
                 stx`<presence from='lounge@montague.lit/annoyingGuy'
@@ -2269,7 +2269,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
 
             let message =

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

@@ -9,7 +9,7 @@ describe("Groupchats", function () {
                 mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
             const muc_jid = 'trollbox@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'troll');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'troll');
             const view = _converse.chatboxviews.get(muc_jid);
             const textarea = await u.waitUntil(() => view.querySelector('textarea.chat-textarea'));
             textarea.value = 'Hello world';
@@ -63,7 +63,7 @@ describe("Groupchats", function () {
                 'muc_moderated',
             ]
             const muc_jid = 'trollbox@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'troll', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'troll', features);
             const view = _converse.chatboxviews.get(muc_jid);
             await u.waitUntil(() => view.querySelector('.chat-textarea'));
 

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

@@ -14,7 +14,7 @@ describe("A MUC", function () {
 
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, nick);
 
         expect(model.get('nick')).toBe(nick);
         expect(model.occupants.length).toBe(1);
@@ -174,7 +174,7 @@ describe("A MUC", function () {
          *  </presence>
          */
         const { __ } = _converse;
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'oldnick');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'oldnick');
 
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         await u.waitUntil(() => view.querySelectorAll('li .occupant-nick').length, 500);

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

@@ -19,7 +19,7 @@ describe("The MUC occupants filter", function () {
             'jid': 'tybalt@capulet.lit',
             'affiliation': 'member'
         }];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => view.model.occupants.length === 3);
 

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

@@ -13,7 +13,7 @@ describe("The occupants sidebar", function () {
             'jid': 'juliet@capulet.lit',
             'affiliation': 'member'
         }];
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], members);
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', [], members);
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => view.model.occupants.length === 2);
 
@@ -87,7 +87,7 @@ describe("The occupants sidebar", function () {
     it("shows users currently present in the groupchat",
         mock.initConverse([], {}, async function (_converse) {
 
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
         var view = _converse.chatboxviews.get('lounge@montague.lit');
         const occupants = view.querySelector('.occupant-list');
         for (var i=0; i<mock.chatroom_names.length; i++) {
@@ -138,7 +138,7 @@ describe("The occupants sidebar", function () {
     it("indicates moderators and visitors by means of a special css class and tooltip",
             mock.initConverse([], {'view_mode': 'fullscreen'}, async function (_converse) {
 
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         let contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
 

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

@@ -9,7 +9,7 @@ describe("Groupchats", function () {
                 mock.initConverse([], {'muc_send_probes': true}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
             let stanza = stx`<message xmlns="jabber:client" to="${_converse.jid}" type="groupchat" from="${muc_jid}/ralphm">
                     <body>This message will trigger a presence probe</body>

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

@@ -17,7 +17,7 @@ describe("XEP-0437 Room Activity Indicators", function () {
         expect(_converse.session.get('rai_enabled_domains')).toBe(undefined);
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         expect(view.model.get('hidden')).toBe(false);
 
@@ -196,7 +196,7 @@ describe("XEP-0437 Room Activity Indicators", function () {
         expect(_converse.session.get('rai_enabled_domains')).toBe(undefined);
 
         const muc_jid = 'lounge@montague.lit';
-        const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        const model = await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         expect(model.get('hidden')).toBe(false);
         const sent_stanzas = [];
         spyOn(_converse.api.connection.get(), 'send').and.callFake(s => sent_stanzas.push(s?.nodeTree ?? s));

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

@@ -40,7 +40,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const received_stanza = stx`
                 <message to="${_converse.jid}"
@@ -89,7 +89,7 @@ describe("Message Retractions", function () {
             const date = (new Date()).toISOString();
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const retraction_stanza = stx`
                 <message type="groupchat"
@@ -149,7 +149,7 @@ describe("Message Retractions", function () {
             const date = (new Date()).toISOString();
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const retraction_stanza = stx`
                 <message xmlns="jabber:client" from="${muc_jid}" type="groupchat" id="retraction-id-1">
                     <retract id="stanza-id-1" xmlns='urn:xmpp:message-retract:1'>
@@ -204,7 +204,7 @@ describe("Message Retractions", function () {
         it("can be followed up by a retraction by the author", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const received_stanza = stx`
             <message to="${_converse.jid}"
@@ -253,7 +253,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
 
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
@@ -344,7 +344,7 @@ describe("Message Retractions", function () {
                 mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
             const muc_jid = 'lounge@montague.lit';
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -370,7 +370,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -445,7 +445,7 @@ describe("Message Retractions", function () {
             const nick = 'romeo';
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE, Strophe.NS.OCCUPANTID];
-            const model = await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+            const model = await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
 
             // The other moderator enters
             const name = mock.chatroom_names[0];
@@ -525,7 +525,7 @@ describe("Message Retractions", function () {
         it("can be retracted by its author", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -582,7 +582,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
 
@@ -630,7 +630,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -661,7 +661,7 @@ describe("Message Retractions", function () {
         it("can be retracted by a moderator", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -713,7 +713,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
             const occupant = view.model.getOwnOccupant();
             expect(occupant.get('role')).toBe('moderator');
@@ -812,7 +812,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
@@ -888,7 +888,7 @@ describe("Message Retractions", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const features = [...mock.default_muc_features, Strophe.NS.MODERATE];
-            await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', features);
+            await mock.openAndEnterMUC(_converse, muc_jid, 'romeo', features);
             const view = _converse.chatboxviews.get(muc_jid);
 
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;

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

@@ -9,7 +9,7 @@ describe("An incoming groupchat Message", function () {
                 async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         const msg_text = "This *message mentions romeo*";
         const msg = stx`
@@ -38,7 +38,7 @@ describe("An incoming groupchat Message", function () {
                 async function (_converse) {
 
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
         const view = _converse.chatboxviews.get(muc_jid);
         const msg_text = "x_y_z_ hello";
         const msg = stx`

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

@@ -9,7 +9,7 @@ describe("A Groupchat Message", function () {
     it("will render an unfurl based on OGP data", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const unfurl_image_src = "https://i.ytimg.com/vi/dQw4w9WgXcQ/maxresdefault.jpg";
@@ -57,7 +57,7 @@ describe("A Groupchat Message", function () {
          * url. This test is to check that we fall back gracefully */
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -91,7 +91,7 @@ describe("A Groupchat Message", function () {
     it("will render an unfurl containing a GIF", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
         const unfurl_url = "https://giphy.com/gifs/giphyqa-4YY4DnqeUDBXNTcYMu";
         const gif_url = "https://media4.giphy.com/media/4YY4DnqeUDBXNTcYMu/giphy.gif?foo=bar";
@@ -129,7 +129,7 @@ describe("A Groupchat Message", function () {
     it("will render multiple unfurls based on OGP data", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -183,7 +183,7 @@ describe("A Groupchat Message", function () {
     it("will not render an unfurl received from a MUC participant", mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -225,7 +225,7 @@ describe("A Groupchat Message", function () {
         const { api } = _converse;
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -272,7 +272,7 @@ describe("A Groupchat Message", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -317,7 +317,7 @@ describe("A Groupchat Message", function () {
 
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -359,7 +359,7 @@ describe("A Groupchat Message", function () {
 
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const message_stanza = stx`
@@ -411,7 +411,7 @@ describe("A Groupchat Message", function () {
         const { jid: own_jid } = api.connection.get();
         const nick = 'romeo';
         const muc_jid = 'lounge@muc.montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick);
         const view = _converse.chatboxviews.get(muc_jid);
 
         const unfurl_image_src = "https://i.ytimg.com/vi/dQw4w9WgXcQ/maxresdefault.jpg";

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

@@ -8,7 +8,7 @@ describe("XSS", function () {
         it("escapes occupant nicknames when rendering them, to avoid JS-injection attacks",
                 mock.initConverse([], {}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+            await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
 
             const presence = stx`
                 <presence xmlns="jabber:client"
@@ -31,7 +31,7 @@ describe("XSS", function () {
         it("escapes the subject before rendering it, to avoid JS-injection attacks",
                 mock.initConverse([], {}, async function (_converse) {
 
-            await mock.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'jc');
+            await mock.openAndEnterMUC(_converse, 'jdev@conference.jabber.org', 'jc');
             spyOn(window, 'alert');
             const subject = '<img src="x" onerror="alert(\'XSS\');"/>';
             const view = _converse.chatboxviews.get('jdev@conference.jabber.org');

src/plugins/notifications/tests/notification.js

@@ -36,7 +36,7 @@ describe("Notifications", function () {
                         mock.initConverse([], {}, async (_converse) => {
 
                     await mock.waitForRoster(_converse, 'current');
-                    await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+                    await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
                     const view = _converse.chatboxviews.get('lounge@montague.lit');
                     const stub = jasmine.createSpyObj('MyNotification', ['onclick', 'close']);
                     spyOn(window, 'Notification').and.returnValue(stub);
@@ -144,7 +144,7 @@ describe("Notifications", function () {
             it("is played when the current user is mentioned in a groupchat", mock.initConverse([], {}, async (_converse) => {
 
                 await mock.waitForRoster(_converse, 'current');
-                await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
+                await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo');
                 const { api } = _converse;
                 api.settings.set('play_sounds', true);
 

src/plugins/omemo/tests/corrections.js

@@ -233,7 +233,7 @@ describe("An OMEMO encrypted MUC message", function() {
         const { jid: own_jid } = api.connection.get();
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
         await u.waitUntil(() => mock.initializedOMEMO(_converse));
 
         const view = _converse.chatboxviews.get(muc_jid);

src/plugins/omemo/tests/muc.js

@@ -26,7 +26,7 @@ describe("The OMEMO module", function() {
         const { jid: own_jid } = api.connection.get();
         const nick = 'romeo';
         const muc_jid = 'lounge@montague.lit';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, nick, features);
+        await mock.openAndEnterMUC(_converse, muc_jid, nick, features);
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         await u.waitUntil(() => mock.initializedOMEMO(_converse));
 
@@ -198,7 +198,7 @@ describe("The OMEMO module", function() {
             'muc_unmoderated',
             'muc_nonanonymous'
         ];
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo', features);
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo', features);
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         await u.waitUntil(() => mock.initializedOMEMO(_converse));
 
@@ -332,7 +332,7 @@ describe("The OMEMO module", function() {
             'muc_unmoderated',
             'muc_nonanonymous'
         ];
-        await mock.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo', features);
+        await mock.openAndEnterMUC(_converse, 'lounge@montague.lit', 'romeo', features);
         const view = _converse.chatboxviews.get('lounge@montague.lit');
         await u.waitUntil(() => mock.initializedOMEMO(_converse));
 

src/plugins/push/tests/push.js

@@ -83,7 +83,7 @@ describe("XEP-0357 Push Notifications", function () {
         expect(_converse.session.get('push_enabled').length).toBe(1);
         expect(_converse.session.get('push_enabled').includes('romeo@montague.lit')).toBe(true);
 
-        mock.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'oldhag');
+        mock.openAndEnterMUC(_converse, 'coven@chat.shakespeare.lit', 'oldhag');
         await mock.waitUntilDiscoConfirmed(
             _converse, 'chat.shakespeare.lit',
             [{'category': 'account', 'type':'registered'}],

src/plugins/roomslist/tests/roomslist.js

@@ -66,7 +66,7 @@ describe("A list of open groupchats", function () {
 
         const muc_jid = 'kitchen@conference.shakespeare.lit';
         const message = 'fires: Your attention is required';
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'fires');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'fires');
         const view = _converse.chatboxviews.get(muc_jid);
         await u.waitUntil(() => roomspanel.querySelectorAll('.available-room').length);
         expect(roomspanel.querySelectorAll('.available-room').length).toBe(1);
@@ -153,7 +153,7 @@ describe("A groupchat shown in the groupchats list", function () {
         const muc_jid = 'coven@chat.shakespeare.lit';
         await mock.waitForRoster(_converse, 'current', 0);
         await mock.openControlBox(_converse);
-        await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, muc_jid, 'romeo');
 
         const rooms_list = document.querySelector('converse-rooms-list');
         await u.waitUntil(() => rooms_list.querySelectorAll(".open-room").length, 500);
@@ -314,7 +314,7 @@ describe("A groupchat shown in the groupchats list", function () {
         const room_jid = 'kitchen@conference.shakespeare.lit';
         const rooms_list = document.querySelector('converse-rooms-list');
         await u.waitUntil(() => rooms_list !== undefined, 500);
-        await mock.openAndEnterChatRoom(_converse, room_jid, 'romeo');
+        await mock.openAndEnterMUC(_converse, room_jid, 'romeo');
         const view = _converse.chatboxviews.get(room_jid);
         u.minimize(view.model);
         const nick = mock.chatroom_names[0];

src/shared/tests/mock.js

@@ -415,7 +415,7 @@ async function openAddMUCModal (_converse) {
     return modal;
 }
 
-async function openAndEnterChatRoom (
+async function openAndEnterMUC (
         _converse,
         muc_jid,
         nick,
@@ -900,14 +900,13 @@ Object.assign(mock, {
     default_muc_features,
     deviceListFetched,
     event,
-    waitForMUCDiscoFeatures,
     groups,
     groups_map,
     initConverse,
     initializedOMEMO,
     num_contacts,
     openAddMUCModal,
-    openAndEnterChatRoom,
+    openAndEnterMUC,
     openChatBoxFor,
     openChatBoxes,
     openChatRoomViaModal,
@@ -920,6 +919,7 @@ Object.assign(mock, {
     sendMessage,
     toggleControlBox,
     view_mode,
+    waitForMUCDiscoFeatures,
     waitForReservedNick,
     waitForRoster,
     waitOnDiscoInfoForNewMUC,