Merge pull request #63 from kuzzleio/bugfix

KuzzleRoom.count now fail if there is no room ID

Author: Gilles Ballini

src/kuzzleRoom.js

@@ -126,13 +126,18 @@ KuzzleRoom.prototype.count = function (cb) {
   var data;
 
   this.kuzzle.callbackRequired('KuzzleRoom.count', cb);
+
   data = this.kuzzle.addHeaders({body: {roomId: this.roomId}}, this.headers);
 
   if (this.subscribing) {
     this.queue.push({action: 'count', args: [cb]});
     return this;
   }
 
+  if (!this.roomId) {
+    throw new Error('KuzzleRoom.count: cannot count subscriptions on an inactive room');
+  }
+
   this.kuzzle.query(this.collection.buildQueryArgs('subscribe', 'count'), data, function (err, res) {
     if (err) {
       return cb(err);
@@ -165,6 +170,8 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     filters = null;
   }
 
+  self.kuzzle.callbackRequired('KuzzleRoom.renew', cb);
+
   /*
     Skip subscription renewal if another one was performed a moment before
    */
@@ -191,8 +198,6 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     return self;
   }
 
-  self.kuzzle.callbackRequired('KuzzleRoom.renew', cb);
-
   self.unsubscribe();
   self.roomId = null;
   self.subscribing = true;

test/kuzzleRoom/methods.test.js

@@ -71,6 +71,7 @@ describe('KuzzleRoom methods', function () {
         body: {}
       };
       room = new KuzzleRoom(dataCollection);
+      room.roomId = 'foobar';
     });
 
     it('should send the right query to Kuzzle', function () {
@@ -111,6 +112,11 @@ describe('KuzzleRoom methods', function () {
         done();
       });
     });
+
+    it('should fail if the room has no room ID', function () {
+      room.roomId = undefined;
+      should(function () {room.count(function () {})}).throw();
+    });
   });
 
   describe('#renew', function () {