Fix failing tests

dist/converse.js

@@ -75878,6 +75878,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         toHTML() {
           return tpl_chatroom_details_modal(_.extend(this.model.toJSON(), {
+            '_': _,
             '__': __,
             'display_name': __('Groupchat info for %1$s', this.model.getDisplayName()),
             'num_occupants': this.model.occupants.length
@@ -84258,15 +84259,19 @@ __e(o.jid) +
 __e(o.__('Description')) +
 '</strong>: ' +
 __e(o.description) +
-'</p>\n                    <p class="room-info"><strong>' +
+'</p>\n                    ';
+ if (o.subject) { ;
+__p += '\n                        <p class="room-info"><strong>' +
 __e(o.__('Topic')) +
 '</strong>: ' +
-__e(o.subject.text) +
-'</p>\n                    <p class="room-info"><strong>' +
-__e(o.__('Topic Author')) +
+__e(o._.get(o.subject, 'text')) +
+'</p>\n                        <p class="room-info"><strong>' +
+__e(o.__('Topic author')) +
 '</strong>: ' +
-__e(o.subject.author) +
-'</p>\n                    <p class="room-info"><strong>' +
+__e(o._.get(o.subject, 'author')) +
+'</p>\n                    ';
+ } ;
+__p += '\n                    <p class="room-info"><strong>' +
 __e(o.__('Online users')) +
 '</strong>: ' +
 __e(o.num_occupants) +

spec/roomslist.js

@@ -114,7 +114,7 @@
 
                 const room_els = _converse.rooms_list_view.el.querySelectorAll(".open-room");
                 expect(room_els.length).toBe(1);
-                var info_el = _converse.rooms_list_view.el.querySelector(".room-info");
+                const info_el = _converse.rooms_list_view.el.querySelector(".room-info");
                 info_el.click();
 
                 const modal = view.model.room_details_modal;
@@ -122,8 +122,8 @@
             }).then(() => {
                 const modal = view.model.room_details_modal;
                 let els = modal.el.querySelectorAll('p.room-info');
-                expect(els[0].textContent).toBe("Room address (JID): coven@chat.shakespeare.lit")
-                expect(els[1].textContent).toBe("Name: A Dark Cave")
+                expect(els[0].textContent).toBe("Name: A Dark Cave")
+                expect(els[1].textContent).toBe("Room address (JID): coven@chat.shakespeare.lit")
                 expect(els[2].textContent).toBe("Description: This is the description")
                 expect(els[3].textContent).toBe("Online users: 1")
                 const features_list = modal.el.querySelector('.features-list');
@@ -149,8 +149,17 @@
 
                 els = modal.el.querySelectorAll('p.room-info');
                 expect(els[3].textContent).toBe("Online users: 2")
+
+                view.model.set({'subject': {'author': 'someone', 'text': 'Hatching dark plots'}});
+                els = modal.el.querySelectorAll('p.room-info');
+                expect(els[0].textContent).toBe("Name: A Dark Cave")
+                expect(els[1].textContent).toBe("Room address (JID): coven@chat.shakespeare.lit")
+                expect(els[2].textContent).toBe("Description: This is the description")
+                expect(els[3].textContent).toBe("Topic: Hatching dark plots")
+                expect(els[4].textContent).toBe("Topic author: someone")
+                expect(els[5].textContent).toBe("Online users: 2")
                 done();
-            });
+            }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
         }));
 
         it("can be closed", mock.initConverseWithPromises(

src/converse-muc-views.js

@@ -493,6 +493,7 @@
                 toHTML () {
                     return tpl_chatroom_details_modal(_.extend(
                         this.model.toJSON(), {
+                            '_': _,
                             '__': __,
                             'display_name': __('Groupchat info for %1$s', this.model.getDisplayName()),
                             'num_occupants': this.model.occupants.length

src/templates/chatroom_details_modal.html

@@ -10,8 +10,10 @@
                     <p class="room-info"><strong>{{{o.__('Name')}}}</strong>: {{{o.name}}}</p>
                     <p class="room-info"><strong>{{{o.__('Room address (JID)')}}}</strong>: {{{o.jid}}}</p>
                     <p class="room-info"><strong>{{{o.__('Description')}}}</strong>: {{{o.description}}}</p>
-                    <p class="room-info"><strong>{{{o.__('Topic')}}}</strong>: {{{o.subject.text}}}</p>
-                    <p class="room-info"><strong>{{{o.__('Topic Author')}}}</strong>: {{{o.subject.author}}}</p>
+                    {[ if (o.subject) { ]}
+                        <p class="room-info"><strong>{{{o.__('Topic')}}}</strong>: {{{o._.get(o.subject, 'text')}}}</p>
+                        <p class="room-info"><strong>{{{o.__('Topic author')}}}</strong>: {{{o._.get(o.subject, 'author')}}}</p>
+                    {[ } ]}
                     <p class="room-info"><strong>{{{o.__('Online users')}}}</strong>: {{{o.num_occupants}}}</p>
                     <p class="room-info"><strong>{{{o.__('Features')}}}</strong>:
                         <div class="chatroom-features">