Fixed socketio#285

3rd-Eden · 3rd-Eden · commit a70347b15ff1 · 2011-07-05T00:37:19.000+02:00
diff --git a/lib/namespace.js b/lib/namespace.js
@@ -109,7 +109,7 @@ SocketNamespace.prototype.__defineGetter__('volatile', function () {
  */
 
 SocketNamespace.prototype.in = function (room) {
-  this.flags.endpoint = this.name + room;
+  this.flags.endpoint = this.name + (room ? '/' + room : '');
   return this;
 };
 
diff --git a/test/namespace.test.js b/test/namespace.test.js
@@ -173,14 +173,15 @@ module.exports = {
 
     cl.handshake(function (sid) {
      ws1 = websocket(cl, sid);
+
       ws1.on('open', function() {
         ws1.packet({
             type: 'connect'
           , endpoint: 'a'
         });
       });
 
-      ws1.on('message', function(data) {
+      ws1.on('message', function (data) {
         if (data.type === 'connect') {
           ++connect;
           if (++calls === expected) finish();
@@ -199,13 +200,49 @@ module.exports = {
 
       cl.handshake(function (sid) {
         ws2 = websocket(cl, sid);
-        ws2.on('open', function() {
+
+        ws2.on('open', function () {
           ws2.packet({
               type: 'connect'
             , endpoint: 'a'
           });
         });
       })
     })
+  },
+
+  'joining rooms inside a namespace': function (done) {
+    var cl = client(++ports)
+      , io = create(cl)
+      , calls = 0
+        console.log(data)
+      , ws;
+
+    io.of('/foo').on('connection', function (socket) {
+      socket.join('foo.bar');
+      this.in('foo.bar').emit('baz', 'pewpew');
+    });
+
+    cl.handshake(function (sid) {
+      ws = websocket(cl, sid);
+
+      ws.on('open', function (){
+         ws.packet({
+            type: 'connect'
+          , endpoint: '/foo'
+        });
+      });
+
+      ws.on('message', function (data) {
+        if (data.type === 'event') {
+          data.name.should.equal('baz');
+
+          cl.end();
+          ws.finishClose();
+          io.server.close();
+          done();
+        }
+      });
+    })
   }
 };
