From 46a4a57481df8c1f946fa06365ab385ae7694290 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Mon, 22 Dec 2014 21:21:30 +0000
Subject: [PATCH] adjusted some tests

---
 .../app/server/collection_methods/chat.coffee |  2 +-
 .../server/unit/CollectionMethodsSpec.js      | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/labs/meteor-client/app/server/collection_methods/chat.coffee b/labs/meteor-client/app/server/collection_methods/chat.coffee
index edfafef151..66727f023c 100755
--- a/labs/meteor-client/app/server/collection_methods/chat.coffee
+++ b/labs/meteor-client/app/server/collection_methods/chat.coffee
@@ -61,7 +61,7 @@ Meteor.methods
 				from_lang: messageObject.from_lang
 
 		id = Meteor.Chat.insert(entry)
-		Meteor.log.info "added chat id=[#{id}]:#{messageObject.message}. Chat.size is now #{Meteor.Chat.find({meetingId: meetingId}).count()}"
+		Meteor.log.info "added chat id=[#{id}]:#{messageObject.message}." #" Chat.size is now #{Meteor.Chat.find({meetingId: meetingId}).count()}"
 
 
 # called on server start and meeting end
diff --git a/labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js b/labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js
index 94b7f6fd52..4f7c913db8 100755
--- a/labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js
+++ b/labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js
@@ -1,4 +1,4 @@
-xdescribe("Collections", function () {
+describe("Collections", function () {
   beforeEach(function () {
     MeteorStubs.install();
   });
@@ -19,7 +19,12 @@ xdescribe("Collections", function () {
     spyOn(Meteor.Slides, "remove");
     spyOn(Meteor.Presentations, "remove");
 
-    clearCollections();
+    clearUsersCollection();
+    clearChatCollection();
+    clearMeetingsCollection();
+    clearShapesCollection();
+    clearSlidesCollection();
+    clearPresentationsCollection();
 
     expect(Meteor.Users.remove).toHaveBeenCalled();
     expect(Meteor.Chat.remove).toHaveBeenCalled();
@@ -35,8 +40,8 @@ xdescribe("Collections", function () {
 
   it("should be handled correctly by insert() on calling addChatToCollection() in case of private chat", function () {
     spyOn(Meteor.Users, "findOne").and.callFake(function(doc) {
-      if(doc.userId == "user001") return { _id: "dbid001" };
-      else if(doc.userId == "user002") return { _id: "dbid002" };
+      if(doc.userId == "user001") return { userId: "user001" };
+      else if(doc.userId == "user002") return { userUd: "user002" };
     });
     spyOn(Meteor.Chat, "insert");
 
@@ -61,8 +66,8 @@ xdescribe("Collections", function () {
         to_username: "Anton",
         from_tz_offset: "240",
         from_color: "0x000000",
-        to_userid: "dbid002",//not "user002"
-        from_userid: "dbid001",//not "user001"
+        to_userid: "user002",//not "dbid002"
+        from_userid: "user001",//not "dbid001"
         from_time: "123",
         from_username: "Maxim",
         from_lang: "en"
@@ -99,7 +104,7 @@ xdescribe("Collections", function () {
         from_tz_offset: "240",
         from_color: "0x000000",
         to_userid: "public_chat_userid",
-        from_userid: "dbid001",
+        from_userid: "user001",
         from_time: "123",
         from_username: "Maxim",
         from_lang: "en"