Fetch the room information before opening the room.

docs/CHANGES.md

@@ -2,9 +2,8 @@
 
 ## 2.0.4 (Unreleased)
 - #737: Bugfix. Translations weren't being applied. [jcbrand]
-- Room information as returned by the server is now stored on the room model.
-  For context, see: http://xmpp.org/extensions/xep-0045.html#disco-roominfo
-  [jcbrand]
+- Fetch room info and store it on the room model.
+  For context, see: http://xmpp.org/extensions/xep-0045.html#disco-roominfo [jcbrand]
 - Bugfix. Switching from bookmarks form to config form shows only the spinner. [jcbrand]
 - Bugfix. Other room occupants sometimes not shown when reloading the page. [jcbrand]
 - Bugfix. Due to changes in `converse-core` the controlbox wasn't aware anymore of

src/converse-bookmarks.js

@@ -104,7 +104,7 @@
                     if (!_.isUndefined(model) && model.get('nick')) {
                         this.join(this.model.get('nick'));
                     } else {
-                        this.__super__.checkForReservedNick.apply(this, arguments);
+                        return this.__super__.checkForReservedNick.apply(this, arguments);
                     }
                 },
 

src/converse-chatview.js

@@ -662,7 +662,6 @@
                         // model is going to be destroyed afterwards.
                         this.model.set('chat_state', converse.INACTIVE);
                         this.sendChatState();
-
                         this.model.destroy();
                     }
                     this.remove();

tests/utils.js

@@ -122,6 +122,16 @@
         utils.openChatRoom(converse, room, server);
         var view = converse.chatboxviews.get(room+'@'+server);
 
+        // We pretend this is a new room, so no disco info is returned.
+        var features_stanza = $iq({
+                from: 'lounge@localhost',
+                'id': IQ_id,
+                'to': 'dummy@localhost/desktop',
+                'type': 'error'
+            }).c('error', {'type': 'cancel'})
+                .c('item-not-found', {'xmlns': "urn:ietf:params:xml:ns:xmpp-stanzas"});
+        converse.connection._dataRecv(utils.createRequest(features_stanza));
+
         // The XMPP server returns the reserved nick for this user.
         var stanza = $iq({
             'type': 'result',