From 1b6afff574ce35cb721ce500220fdfa919e31447 Mon Sep 17 00:00:00 2001
From: Evan Tahler <evantahler@gmail.com>
Date: Wed, 25 Jan 2012 23:06:47 -0800
Subject: [PATCH] tests fixed

---
 initializers/initSocketServer.js |  4 ++--
 initializers/initStats.js        | 10 +++-------
 spec/action_status.js            |  5 +++--
 spec/api_socket.js               |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/initializers/initSocketServer.js b/initializers/initSocketServer.js
index 8cffa2546..e64b82321 100644
--- a/initializers/initSocketServer.js
+++ b/initializers/initSocketServer.js
@@ -172,8 +172,8 @@ var initSocketServer = function(api, next){
 		if(loop == null){loop = true;}
 		results = {};
 		results.rooms = {};
-		for(var i in api.connections){
-			var thisConnection = api.connections[i];
+		for(var i in api.socketServer.connections){
+			var thisConnection = api.socketServer.connections[i];
 			var thisRoom = thisConnection.room;
 			if(results.rooms[thisRoom] == null){
 				results.rooms[thisRoom] = {members: [], membersCount: 0};
diff --git a/initializers/initStats.js b/initializers/initStats.js
index 9b9da9550..bedb9d211 100644
--- a/initializers/initStats.js
+++ b/initializers/initStats.js
@@ -7,8 +7,6 @@ var initStats = function(api, next){
 	
 	api.stats.init = function(api, next){
 		var stats = {};
-		stats.numberOfWebRequests = 0;
-		stats.numberOfSocketRequests = 0;
 		stats.startTime = new Date().getTime();	
 		stats.pid = process.pid;
 		api.cache.save(api, "_stats", stats, cacheTime, function(){
@@ -17,12 +15,10 @@ var initStats = function(api, next){
 	}
 	
 	api.stats.load = function(next){
-		api.stats.calculate(api, function(){
+		api.stats.calculate(api, function(stats){
 			api.actionCluster.cache.load(api, "_stats", function(clusterResp){
 				if(clusterResp == false){
-					api.cache.load(api, "_stats", function(localResp){
-						next(localResp);
-					});
+					next(stats);
 				}else{
 					next(clusterResp);
 				}
@@ -51,7 +47,7 @@ var initStats = function(api, next){
 			};
 			
 			api.cache.save(api, "_stats", stats, cacheTime, function(){
-				if(typeof next == "function"){ next(); }
+				if(typeof next == "function"){ next(stats); }
 			});
 		});
 	}
diff --git a/spec/action_status.js b/spec/action_status.js
index 4787b68f4..3b2360e61 100644
--- a/spec/action_status.js
+++ b/spec/action_status.js
@@ -15,11 +15,12 @@ suite.addBatch({
     topic: function(){ specHelper.apiTest.get(actionUrl, {} ,this.callback ); },
     error: function(res, b){ specHelper.assert.equal(res.body.error, "OK");},
   },
+
   "status: stats": {
     topic: function(){ specHelper.apiTest.get(actionUrl, {} ,this.callback ); },
     stats: function(res, b){ 
-      specHelper.assert.isTrue(res.body.stats.numberOfWebRequests > 0);
-      specHelper.assert.isTrue(res.body.stats.numberOfSocketRequests >= 0);
+      specHelper.assert.isTrue(res.body.stats.webServer.numberOfWebRequests > 0);
+      specHelper.assert.isTrue(res.body.stats.socketServer.numberOfSocketRequests >= 0);
       specHelper.assert.isTrue(res.body.stats.startTime > 0);
       specHelper.assert.isTrue(res.body.stats.uptimeSeconds > 0);
 	  specHelper.assert.isTrue(res.body.stats.pid > 0);
diff --git a/spec/api_socket.js b/spec/api_socket.js
index bf9b277e3..f12266e84 100644
--- a/spec/api_socket.js
+++ b/spec/api_socket.js
@@ -56,7 +56,7 @@ suite.addBatch({
 			makeSocketRequest(client, this.callback, "status");
 		}, 'works' : function(resp, d){
 			specHelper.assert.isObject(d.stats);
-			specHelper.assert.equal(d.stats.numberOfSocketRequests, 3);
+			specHelper.assert.equal(d.stats.socketServer.numberOfSocketRequests, 3);
 		}
 	}
 });