Browse Source

Remove the openChatRoomViaModal test utils function

JC Brand 5 months ago
parent
commit
3249d6b5e9
2 changed files with 2 additions and 20 deletions
  1. 2 1
      src/plugins/muc-views/tests/nickname.js
  2. 0 19
      src/shared/tests/mock.js

+ 2 - 1
src/plugins/muc-views/tests/nickname.js

@@ -337,8 +337,9 @@ describe("A MUC", function () {
         it("will render a nickname form if a nickname conflict happens and muc_nickname_from_jid=false",
         it("will render a nickname form if a nickname conflict happens and muc_nickname_from_jid=false",
                 mock.initConverse([], { vcard: { nickname: '' }}, async function (_converse) {
                 mock.initConverse([], { vcard: { nickname: '' }}, async function (_converse) {
 
 
+            const { api } = _converse;
             const muc_jid = 'conflicted@muc.montague.lit';
             const muc_jid = 'conflicted@muc.montague.lit';
-            await mock.openChatRoomViaModal(_converse, muc_jid, 'romeo');
+            api.rooms.open(muc_jid, { nick: 'romeo' });
             await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
             await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
 
 
             _converse.api.connection.get()._dataRecv(mock.createRequest(stx`
             _converse.api.connection.get()._dataRecv(mock.createRequest(stx`

+ 0 - 19
src/shared/tests/mock.js

@@ -215,24 +215,6 @@ async function openChatBoxFor (_converse, jid) {
     return u.waitUntil(() => _converse.chatboxviews.get(jid), 1000);
     return u.waitUntil(() => _converse.chatboxviews.get(jid), 1000);
 }
 }
 
 
-async function openChatRoomViaModal (_converse, muc_jid, nick='') {
-    const controlbox = await _converse.api.controlbox.open('controlbox');
-    await u.waitUntil(() => controlbox.get('connected'));
-    await openControlBox(_converse);
-
-    document.querySelector('converse-rooms-list .show-add-muc-modal').click();
-    closeControlBox(_converse);
-    const modal = _converse.api.modal.get('converse-add-muc-modal');
-    await u.waitUntil(() => u.isVisible(modal), 1500)
-    modal.querySelector('input[name="chatroom"]').value = muc_jid;
-    if (nick) {
-        modal.querySelector('input[name="nickname"]').value = nick;
-    }
-    modal.querySelector('form input[type="submit"]').click();
-    await mock.waitForMUCDiscoFeatures(_converse, muc_jid);
-    if (!nick) await mock.waitForReservedNick(_converse, muc_jid, '');
-}
-
 async function waitOnDiscoInfoForNewMUC(_converse, muc_jid) {
 async function waitOnDiscoInfoForNewMUC(_converse, muc_jid) {
     const { api } = _converse;
     const { api } = _converse;
     const connection = api.connection.get();
     const connection = api.connection.get();
@@ -909,7 +891,6 @@ Object.assign(mock, {
     openAndEnterMUC,
     openAndEnterMUC,
     openChatBoxFor,
     openChatBoxFor,
     openChatBoxes,
     openChatBoxes,
-    openChatRoomViaModal,
     openControlBox,
     openControlBox,
     ownDeviceHasBeenPublished,
     ownDeviceHasBeenPublished,
     pend_names,
     pend_names,