Move bookmarks list tests into separate file

karma.conf.js

@@ -44,6 +44,7 @@ module.exports = function(config) {
       { pattern: "src/headless/tests/eventemitter.js", type: 'module' },
       { pattern: "src/modals/tests/user-details-modal.js", type: 'module' },
       { pattern: "src/plugins/bookmark-views/tests/bookmarks.js", type: 'module' },
+      { pattern: "src/plugins/bookmark-views/tests/bookmarks-list.js", type: 'module' },
       { pattern: "src/plugins/chatview/tests/chatbox.js", type: 'module' },
       { pattern: "src/plugins/chatview/tests/corrections.js", type: 'module' },
       { pattern: "src/plugins/chatview/tests/emojis.js", type: 'module' },

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

@@ -0,0 +1,188 @@
+/* global mock, converse */
+
+const { Strophe, u, sizzle, $iq } = converse.env;
+
+describe("The bookmarks list", function () {
+
+    it("shows a list of bookmarks", mock.initConverse(
+            ['chatBoxesFetched'], {},
+            async function (_converse) {
+
+        await mock.waitForRoster(_converse, 'current', 0);
+        await mock.waitUntilDiscoConfirmed(
+            _converse, _converse.bare_jid,
+            [{'category': 'pubsub', 'type': 'pep'}],
+            ['http://jabber.org/protocol/pubsub#publish-options']
+        );
+        mock.openControlBox(_converse);
+
+        const IQ_stanzas = _converse.connection.IQ_stanzas;
+        const sent_stanza = await u.waitUntil(
+            () => IQ_stanzas.filter(s => sizzle('items[node="storage:bookmarks"]', s).length).pop());
+
+        expect(Strophe.serialize(sent_stanza)).toBe(
+            `<iq from="romeo@montague.lit/orchard" id="${sent_stanza.getAttribute('id')}" type="get" xmlns="jabber:client">`+
+            '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+
+                '<items node="storage:bookmarks"/>'+
+            '</pubsub>'+
+            '</iq>'
+        );
+
+        const stanza = $iq({'to': _converse.connection.jid, 'type':'result', 'id':sent_stanza.getAttribute('id')})
+            .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
+                .c('items', {'node': 'storage:bookmarks'})
+                    .c('item', {'id': 'current'})
+                        .c('storage', {'xmlns': 'storage:bookmarks'})
+                            .c('conference', {
+                                'name': 'The Play&apos;s the Thing',
+                                'autojoin': 'false',
+                                'jid': 'theplay@conference.shakespeare.lit'
+                            }).c('nick').t('JC').up().up()
+                            .c('conference', {
+                                'name': '1st Bookmark',
+                                'autojoin': 'false',
+                                'jid': 'first@conference.shakespeare.lit'
+                            }).c('nick').t('JC').up().up()
+                            .c('conference', {
+                                'autojoin': 'false',
+                                'jid': 'noname@conference.shakespeare.lit'
+                            }).c('nick').t('JC').up().up()
+                            .c('conference', {
+                                'name': 'Bookmark with a very very long name that will be shortened',
+                                'autojoin': 'false',
+                                'jid': 'longname@conference.shakespeare.lit'
+                            }).c('nick').t('JC').up().up()
+                            .c('conference', {
+                                'name': 'Another room',
+                                'autojoin': 'false',
+                                'jid': 'another@conference.shakespeare.lit'
+                            }).c('nick').t('JC').up().up();
+        _converse.connection._dataRecv(mock.createRequest(stanza));
+
+        await u.waitUntil(() => document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length);
+        expect(document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length).toBe(5);
+        let els = document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item a.list-item-link');
+        expect(els[0].textContent).toBe("1st Bookmark");
+        expect(els[1].textContent).toBe("Another room");
+        expect(els[2].textContent).toBe("Bookmark with a very very long name that will be shortened");
+        expect(els[3].textContent).toBe("noname@conference.shakespeare.lit");
+        expect(els[4].textContent).toBe("The Play's the Thing");
+
+        spyOn(_converse.api, 'confirm').and.callFake(() => Promise.resolve(true));
+        document.querySelector('#chatrooms .bookmarks.rooms-list .room-item:nth-child(2) a:nth-child(2)').click();
+        expect(_converse.api.confirm).toHaveBeenCalled();
+        await u.waitUntil(() => document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length === 4)
+        els = document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item a.list-item-link');
+        expect(els[0].textContent).toBe("1st Bookmark");
+        expect(els[1].textContent).toBe("Bookmark with a very very long name that will be shortened");
+        expect(els[2].textContent).toBe("noname@conference.shakespeare.lit");
+        expect(els[3].textContent).toBe("The Play's the Thing");
+    }));
+
+    it("can be used to open a MUC from a bookmark", mock.initConverse(
+            [], {'view_mode': 'fullscreen'}, async function (_converse) {
+
+        const api = _converse.api;
+        await mock.waitUntilDiscoConfirmed(
+            _converse, _converse.bare_jid,
+            [{'category': 'pubsub', 'type': 'pep'}],
+            ['http://jabber.org/protocol/pubsub#publish-options']
+        );
+        await mock.waitForRoster(_converse, 'current', 0);
+        await mock.openControlBox(_converse);
+        const view = await _converse.chatboxviews.get('controlbox');
+        const IQ_stanzas = _converse.connection.IQ_stanzas;
+        const sent_stanza = await u.waitUntil(
+            () => IQ_stanzas.filter(s => sizzle('items[node="storage:bookmarks"]', s).length).pop());
+        const stanza = $iq({'to': _converse.connection.jid, 'type':'result', 'id':sent_stanza.getAttribute('id')})
+            .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
+                .c('items', {'node': 'storage:bookmarks'})
+                    .c('item', {'id': 'current'})
+                        .c('storage', {'xmlns': 'storage:bookmarks'})
+                            .c('conference', {
+                                'name': 'The Play&apos;s the Thing',
+                                'autojoin': 'false',
+                                'jid': 'theplay@conference.shakespeare.lit'
+                            }).c('nick').t('JC').up().up()
+                            .c('conference', {
+                                'name': '1st Bookmark',
+                                'autojoin': 'false',
+                                'jid': 'first@conference.shakespeare.lit'
+                            }).c('nick').t('JC');
+        _converse.connection._dataRecv(mock.createRequest(stanza));
+        await u.waitUntil(() => view.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length);
+        expect(view.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length).toBe(2);
+        view.querySelector('.bookmarks.rooms-list .open-room').click();
+        await u.waitUntil(() => _converse.chatboxes.length === 2);
+        expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(false);
+
+        await u.waitUntil(() => view.querySelectorAll('.list-container--bookmarks .available-chatroom:not(.hidden)').length === 1);
+        view.querySelector('.list-container--bookmarks .available-chatroom:not(.hidden) .open-room').click();
+        await u.waitUntil(() => _converse.chatboxes.length === 3);
+        expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(true);
+        expect((await api.rooms.get('theplay@conference.shakespeare.lit')).get('hidden')).toBe(false);
+
+        view.querySelector('.list-container--openrooms .open-room:first-child').click();
+        await u.waitUntil(() => view.querySelector('.list-item.open').getAttribute('data-room-jid') === 'first@conference.shakespeare.lit');
+        expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(false);
+        expect((await api.rooms.get('theplay@conference.shakespeare.lit')).get('hidden')).toBe(true);
+    }));
+
+    it("remembers the toggle state of the bookmarks list", mock.initConverse(
+            [], {}, async function (_converse) {
+
+        await mock.waitForRoster(_converse, 'current', 0);
+        await mock.openControlBox(_converse);
+        await mock.waitUntilDiscoConfirmed(
+            _converse, _converse.bare_jid,
+            [{'category': 'pubsub', 'type': 'pep'}],
+            ['http://jabber.org/protocol/pubsub#publish-options']
+        );
+
+        const { Strophe, u, sizzle, $iq } = converse.env;
+        const IQ_stanzas = _converse.connection.IQ_stanzas;
+        const sent_stanza = await u.waitUntil(
+            () => IQ_stanzas.filter(s => sizzle('iq items[node="storage:bookmarks"]', s).length).pop());
+
+        expect(Strophe.serialize(sent_stanza)).toBe(
+            `<iq from="romeo@montague.lit/orchard" id="${sent_stanza.getAttribute('id')}" type="get" xmlns="jabber:client">`+
+            '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+
+                '<items node="storage:bookmarks"/>'+
+            '</pubsub>'+
+            '</iq>'
+        );
+        const stanza = $iq({'to': _converse.connection.jid, 'type':'result', 'id': sent_stanza.getAttribute('id')})
+            .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
+                .c('items', {'node': 'storage:bookmarks'})
+                    .c('item', {'id': 'current'})
+                        .c('storage', {'xmlns': 'storage:bookmarks'});
+        _converse.connection._dataRecv(mock.createRequest(stanza));
+        await _converse.api.waitUntil('bookmarksInitialized');
+
+        _converse.bookmarks.create({
+            'jid': 'theplay@conference.shakespeare.lit',
+            'autojoin': false,
+            'name':  'The Play',
+            'nick': ''
+        });
+        const chats_el = document.querySelector('converse-chats');
+        const selector = '#chatrooms .bookmarks.rooms-list .room-item';
+        await u.waitUntil(() => sizzle(selector, chats_el).filter(u.isVisible).length);
+        expect(u.hasClass('collapsed', sizzle('#chatrooms .bookmarks.rooms-list', chats_el).pop())).toBeFalsy();
+        expect(sizzle(selector, chats_el).filter(u.isVisible).length).toBe(1);
+
+        const bookmarks_el = chats_el.querySelector('converse-bookmarks');
+        expect(bookmarks_el.model.get('toggle-state')).toBe(_converse.OPENED);
+
+        sizzle('#chatrooms .bookmarks-toggle', chats_el).pop().click();
+
+        await u.waitUntil(() => u.hasClass('hidden', sizzle('#chatrooms .bookmarks.rooms-list', chats_el).pop()));
+        expect(bookmarks_el.model.get('toggle-state')).toBe(_converse.CLOSED);
+
+        sizzle('#chatrooms .bookmarks-toggle', chats_el).pop().click();
+
+        await u.waitUntil(() => !u.hasClass('hidden', sizzle('#chatrooms .bookmarks.rooms-list', chats_el).pop()));
+        expect(sizzle(selector, chats_el).filter(u.isVisible).length).toBe(1);
+        expect(bookmarks_el.model.get('toggle-state')).toBe(_converse.OPENED);
+    }));
+});

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

@@ -1,6 +1,6 @@
 /* global mock, converse */
 
-const { Strophe, u, sizzle, $iq } = converse.env;
+const { Strophe, sizzle } = converse.env;
 
 
 describe("A chat room", function () {
@@ -491,190 +491,6 @@ describe("Bookmarks", function () {
         expect(_converse.bookmarks.get('theplay@conference.shakespeare.lit').get('autojoin')).toBe(true);
         expect(_converse.bookmarks.get('another@conference.shakespeare.lit').get('autojoin')).toBe(false);
     }));
-
-    describe("The bookmarks list", function () {
-
-        it("shows a list of bookmarks", mock.initConverse(
-                [], {}, async function (_converse) {
-
-            await mock.waitUntilDiscoConfirmed(
-                _converse, _converse.bare_jid,
-                [{'category': 'pubsub', 'type': 'pep'}],
-                ['http://jabber.org/protocol/pubsub#publish-options']
-            );
-            await mock.waitForRoster(_converse, 'current', 0);
-            mock.openControlBox(_converse);
-
-            const IQ_stanzas = _converse.connection.IQ_stanzas;
-            const sent_stanza = await u.waitUntil(
-                () => IQ_stanzas.filter(s => sizzle('items[node="storage:bookmarks"]', s).length).pop());
-
-            expect(Strophe.serialize(sent_stanza)).toBe(
-                `<iq from="romeo@montague.lit/orchard" id="${sent_stanza.getAttribute('id')}" type="get" xmlns="jabber:client">`+
-                '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+
-                    '<items node="storage:bookmarks"/>'+
-                '</pubsub>'+
-                '</iq>'
-            );
-
-            const stanza = $iq({'to': _converse.connection.jid, 'type':'result', 'id':sent_stanza.getAttribute('id')})
-                .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
-                    .c('items', {'node': 'storage:bookmarks'})
-                        .c('item', {'id': 'current'})
-                            .c('storage', {'xmlns': 'storage:bookmarks'})
-                                .c('conference', {
-                                    'name': 'The Play&apos;s the Thing',
-                                    'autojoin': 'false',
-                                    'jid': 'theplay@conference.shakespeare.lit'
-                                }).c('nick').t('JC').up().up()
-                                .c('conference', {
-                                    'name': '1st Bookmark',
-                                    'autojoin': 'false',
-                                    'jid': 'first@conference.shakespeare.lit'
-                                }).c('nick').t('JC').up().up()
-                                .c('conference', {
-                                    'autojoin': 'false',
-                                    'jid': 'noname@conference.shakespeare.lit'
-                                }).c('nick').t('JC').up().up()
-                                .c('conference', {
-                                    'name': 'Bookmark with a very very long name that will be shortened',
-                                    'autojoin': 'false',
-                                    'jid': 'longname@conference.shakespeare.lit'
-                                }).c('nick').t('JC').up().up()
-                                .c('conference', {
-                                    'name': 'Another room',
-                                    'autojoin': 'false',
-                                    'jid': 'another@conference.shakespeare.lit'
-                                }).c('nick').t('JC').up().up();
-            _converse.connection._dataRecv(mock.createRequest(stanza));
-
-            await u.waitUntil(() => document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length);
-            expect(document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length).toBe(5);
-            let els = document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item a.list-item-link');
-            expect(els[0].textContent).toBe("1st Bookmark");
-            expect(els[1].textContent).toBe("Another room");
-            expect(els[2].textContent).toBe("Bookmark with a very very long name that will be shortened");
-            expect(els[3].textContent).toBe("noname@conference.shakespeare.lit");
-            expect(els[4].textContent).toBe("The Play's the Thing");
-
-            spyOn(_converse.api, 'confirm').and.callFake(() => Promise.resolve(true));
-            document.querySelector('#chatrooms .bookmarks.rooms-list .room-item:nth-child(2) a:nth-child(2)').click();
-            expect(_converse.api.confirm).toHaveBeenCalled();
-            await u.waitUntil(() => document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length === 4)
-            els = document.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item a.list-item-link');
-            expect(els[0].textContent).toBe("1st Bookmark");
-            expect(els[1].textContent).toBe("Bookmark with a very very long name that will be shortened");
-            expect(els[2].textContent).toBe("noname@conference.shakespeare.lit");
-            expect(els[3].textContent).toBe("The Play's the Thing");
-        }));
-
-        it("can be used to open a MUC from a bookmark", mock.initConverse(
-                [], {'view_mode': 'fullscreen'}, async function (_converse) {
-
-            const api = _converse.api;
-            await mock.waitUntilDiscoConfirmed(
-                _converse, _converse.bare_jid,
-                [{'category': 'pubsub', 'type': 'pep'}],
-                ['http://jabber.org/protocol/pubsub#publish-options']
-            );
-            await mock.waitForRoster(_converse, 'current', 0);
-            await mock.openControlBox(_converse);
-            const view = await _converse.chatboxviews.get('controlbox');
-            const IQ_stanzas = _converse.connection.IQ_stanzas;
-            const sent_stanza = await u.waitUntil(
-                () => IQ_stanzas.filter(s => sizzle('items[node="storage:bookmarks"]', s).length).pop());
-            const stanza = $iq({'to': _converse.connection.jid, 'type':'result', 'id':sent_stanza.getAttribute('id')})
-                .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
-                    .c('items', {'node': 'storage:bookmarks'})
-                        .c('item', {'id': 'current'})
-                            .c('storage', {'xmlns': 'storage:bookmarks'})
-                                .c('conference', {
-                                    'name': 'The Play&apos;s the Thing',
-                                    'autojoin': 'false',
-                                    'jid': 'theplay@conference.shakespeare.lit'
-                                }).c('nick').t('JC').up().up()
-                                .c('conference', {
-                                    'name': '1st Bookmark',
-                                    'autojoin': 'false',
-                                    'jid': 'first@conference.shakespeare.lit'
-                                }).c('nick').t('JC');
-            _converse.connection._dataRecv(mock.createRequest(stanza));
-            await u.waitUntil(() => view.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length);
-            expect(view.querySelectorAll('#chatrooms div.bookmarks.rooms-list .room-item').length).toBe(2);
-            view.querySelector('.bookmarks.rooms-list .open-room').click();
-            await u.waitUntil(() => _converse.chatboxes.length === 2);
-            expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(false);
-
-            await u.waitUntil(() => view.querySelectorAll('.list-container--bookmarks .available-chatroom:not(.hidden)').length === 1);
-            view.querySelector('.list-container--bookmarks .available-chatroom:not(.hidden) .open-room').click();
-            await u.waitUntil(() => _converse.chatboxes.length === 3);
-            expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(true);
-            expect((await api.rooms.get('theplay@conference.shakespeare.lit')).get('hidden')).toBe(false);
-
-            view.querySelector('.list-container--openrooms .open-room:first-child').click();
-            await u.waitUntil(() => view.querySelector('.list-item.open').getAttribute('data-room-jid') === 'first@conference.shakespeare.lit');
-            expect((await api.rooms.get('first@conference.shakespeare.lit')).get('hidden')).toBe(false);
-            expect((await api.rooms.get('theplay@conference.shakespeare.lit')).get('hidden')).toBe(true);
-        }));
-
-        it("remembers the toggle state of the bookmarks list", mock.initConverse(
-                [], {}, async function (_converse) {
-
-            await mock.waitForRoster(_converse, 'current', 0);
-            await mock.openControlBox(_converse);
-            await mock.waitUntilDiscoConfirmed(
-                _converse, _converse.bare_jid,
-                [{'category': 'pubsub', 'type': 'pep'}],
-                ['http://jabber.org/protocol/pubsub#publish-options']
-            );
-
-            const { Strophe, u, sizzle, $iq } = converse.env;
-            const IQ_stanzas = _converse.connection.IQ_stanzas;
-            const sent_stanza = await u.waitUntil(
-                () => IQ_stanzas.filter(s => sizzle('iq items[node="storage:bookmarks"]', s).length).pop());
-
-            expect(Strophe.serialize(sent_stanza)).toBe(
-                `<iq from="romeo@montague.lit/orchard" id="${sent_stanza.getAttribute('id')}" type="get" xmlns="jabber:client">`+
-                '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+
-                    '<items node="storage:bookmarks"/>'+
-                '</pubsub>'+
-                '</iq>'
-            );
-            const stanza = $iq({'to': _converse.connection.jid, 'type':'result', 'id': sent_stanza.getAttribute('id')})
-                .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
-                    .c('items', {'node': 'storage:bookmarks'})
-                        .c('item', {'id': 'current'})
-                            .c('storage', {'xmlns': 'storage:bookmarks'});
-            _converse.connection._dataRecv(mock.createRequest(stanza));
-            await _converse.api.waitUntil('bookmarksInitialized');
-
-            _converse.bookmarks.create({
-                'jid': 'theplay@conference.shakespeare.lit',
-                'autojoin': false,
-                'name':  'The Play',
-                'nick': ''
-            });
-            const chats_el = document.querySelector('converse-chats');
-            const selector = '#chatrooms .bookmarks.rooms-list .room-item';
-            await u.waitUntil(() => sizzle(selector, chats_el).filter(u.isVisible).length);
-            expect(u.hasClass('collapsed', sizzle('#chatrooms .bookmarks.rooms-list', chats_el).pop())).toBeFalsy();
-            expect(sizzle(selector, chats_el).filter(u.isVisible).length).toBe(1);
-
-            const bookmarks_el = chats_el.querySelector('converse-bookmarks');
-            expect(bookmarks_el.model.get('toggle-state')).toBe(_converse.OPENED);
-
-            sizzle('#chatrooms .bookmarks-toggle', chats_el).pop().click();
-
-            await u.waitUntil(() => u.hasClass('hidden', sizzle('#chatrooms .bookmarks.rooms-list', chats_el).pop()));
-            expect(bookmarks_el.model.get('toggle-state')).toBe(_converse.CLOSED);
-
-            sizzle('#chatrooms .bookmarks-toggle', chats_el).pop().click();
-
-            await u.waitUntil(() => !u.hasClass('hidden', sizzle('#chatrooms .bookmarks.rooms-list', chats_el).pop()));
-            expect(sizzle(selector, chats_el).filter(u.isVisible).length).toBe(1);
-            expect(bookmarks_el.model.get('toggle-state')).toBe(_converse.OPENED);
-        }));
-    });
 });
 
 describe("When hide_open_bookmarks is true and a bookmarked room is opened", function () {