Fix failing tests.

src/converse-controlbox.js

@@ -303,7 +303,7 @@
 
                 close: function (ev) {
                     if (ev && ev.preventDefault) { ev.preventDefault(); }
-                    if (converse.connection.connected) {
+                    if (converse.connection.connected && !converse.connection.disconnecting) {
                         this.model.save({'closed': true});
                     } else {
                         this.model.trigger('hide');

src/converse-core.js

@@ -140,6 +140,7 @@
             // out or disconnecting in the previous session.
             // This happens in tests.
             // We therefore first clean up.
+            converse.connection.reset();
             converse._tearDown();
         }
 
@@ -541,11 +542,11 @@
         };
 
         this.logOut = function () {
-            converse.chatboxviews.closeAllChatBoxes();
             converse.setDisconnectionCause(converse.LOGOUT, undefined, true);
             if (typeof converse.connection !== 'undefined') {
                 converse.connection.disconnect();
             }
+            converse.chatboxviews.closeAllChatBoxes();
             converse.clearSession();
             converse._tearDown();
             converse.emit('logout');