Merge branch 'v11.0.0' into middleware_refactor

evantahler · Apr 4, 2015 · a0fc905 · a0fc905
2 parents dfc21e1 + 9530aa5
commit a0fc905
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/test/servers/websocket.js b/test/servers/websocket.js
@@ -330,20 +330,19 @@ describe('Server: Web Socket', function(){
     });
 
     describe('custom room member data', function(){
-    
+
       var currentSanitize;
       var currentGenerate;
-
-
+
       before(function(done){
         //Ensure that default behavior works
         clientA.roomAdd('defaultRoom',function(){
           clientA.roomView('defaultRoom', function(response){
             response.data.room.should.equal('defaultRoom');
+
             for( var key in response.data.members ){
-            (response.data.members[key].type === undefined ).should.eql(true);
+              ( response.data.members[key].type === undefined ).should.eql(true);
             }
-            clientA.roomLeave('defaultRoom');
 
             //save off current functions
             currentSanitize = api.chatRoom.sanitizeMemberDetails;
@@ -355,13 +354,16 @@ describe('Server: Web Socket', function(){
                  joinedAt: data.joinedAt,
                  type: data.type };
             }
-    
+
             api.chatRoom.generateMemberDetails = function(connection){
             return { id: connection.id,
                  joinedAt: new Date().getTime(),
                  type : connection.type };
-            }       
-            done();
+            }
+
+            clientA.roomLeave('defaultRoom', function(){
+              done();
+            });
           });
         });
       });
@@ -378,11 +380,13 @@ describe('Server: Web Socket', function(){
           clientA.roomView('defaultRoom', function(response){
             response.data.room.should.equal('defaultRoom');
             for( var key in response.data.members ){
-            (response.data.members[key].type === undefined ).should.eql(true);
+              ( response.data.members[key].type === undefined ).should.eql(true);
             }
-            clientA.roomLeave('defaultRoom');
-
-            done();
+            setTimeout(function(){
+              clientA.roomLeave('defaultRoom', function(){
+                done();
+              });
+            }, 100);
           });
         });
       });