From 0d4cf15f0e31967e1ed5cd0e329aad4ca4d57836 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 9 Sep 2015 10:17:46 +0200
Subject: [PATCH] Move changelog entry to right version and add test case.

---
 docs/CHANGES.rst | 6 +++++-
 spec/chatroom.js | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 8758ab8b0..2940e4afa 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.9.6 (Unreleased)
+------------------
+
+* #462 Fix MUC rooms with names containing special characters not working [1st8]
+
 0.9.5 (2015-08-24)
 ------------------
 
@@ -9,7 +14,6 @@ Changelog
 * #440 null added as resource to contact [jcbrand]
 * Add new event serviceDiscovered [jcbrand]
 * Add a new configuration setting `muc_history_max_stanzas <https://conversejs.org/docs/html/configuration.html#muc_history_max_stanzas>`_. [jcbrand]
-* #462 Fix MUC rooms with names containing special characters not working [1st8]
 
 0.9.4 (2015-07-04)
 ------------------
diff --git a/spec/chatroom.js b/spec/chatroom.js
index 2cb8557d0..c4aaf3fd6 100644
--- a/spec/chatroom.js
+++ b/spec/chatroom.js
@@ -11,6 +11,7 @@
 } (this, function ($, mock, test_utils, utils) {
     var $pres = converse_api.env.$pres;
     var $msg = converse_api.env.$msg;
+    var Strophe = converse_api.env.Strophe;
 
     return describe("ChatRooms", $.proxy(function (mock, test_utils) {
         describe("A Chat Room", $.proxy(function () {
@@ -21,6 +22,13 @@
                 });
             });
 
+            it("can have spaces and special characters in its name", function () {
+                test_utils.openChatRoom('lounge & leisure', 'localhost', 'dummy');
+                var view = converse.chatboxviews.get(
+                        Strophe.escapeNode('lounge & leisure')+'@localhost');
+                expect(view instanceof converse.ChatRoomView).toBe(true);
+            });
+
             it("shows users currently present in the room", $.proxy(function () {
                 test_utils.openChatRoom('lounge', 'localhost', 'dummy');
                 var name;