From cdcc085530d6335e2b05fb677c4f3321c27ba3b4 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Fri, 10 Jul 2015 23:21:23 -0500
Subject: [PATCH] Adjust test

---
 test/api/chat.coffee              | 44 ++++++++++---------------------
 website/src/controllers/groups.js |  4 +--
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/test/api/chat.coffee b/test/api/chat.coffee
index 0441e34d6e..38c1254a00 100644
--- a/test/api/chat.coffee
+++ b/test/api/chat.coffee
@@ -105,57 +105,41 @@ describe "Chat", ->
       (cb) ->
         registerManyUsers 1, cb
 
-      (_members, cb) ->
-        userToRemove = _members[0]
-        members = _members
-        inviteURL = baseURL + "/groups/" + group._id + "/invite"
-        request.post(inviteURL).send(
+      (members, cb) ->
+        userToRemove = members[0]
+        request.post(baseURL + "/groups/" + group._id + "/invite").send(
           uuids: [userToRemove._id]
         )
-        .end ->
-          cb()
+        .end -> cb()
 
       (cb) ->
         request.post(baseURL + "/groups/" + group._id + "/join")
           .set("X-API-User", userToRemove._id)
           .set("X-API-Key", userToRemove.apiToken)
-          .end (res) ->
-            cb()
+          .end (res) -> cb()
 
       (cb) ->
         msg = "TestMsg"
-        request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).end (res) ->
-          expectCode res, 200
-          cb()
+        request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg)
+          .end (res) -> cb()
 
       (cb) ->
         request.get(baseURL + "/user")
           .set("X-API-User", userToRemove._id)
           .set("X-API-Key", userToRemove.apiToken)
-            .end (res) ->
-              expect(res.body.newMessages[group._id]).to.exist
-              cb()
+          .end (res) ->
+            expect(res.body.newMessages[group._id]).to.exist
+            cb()
 
       (cb) ->
         request.post(baseURL + "/groups/" + group._id + "/removeMember?uuid=" + userToRemove._id)
-        .send().end (res) ->
-          expectCode res, 204
-          cb()
-
-      (cb) ->
-        request.get(baseURL + "/groups/" + group._id)
-        .send()
-        .end (res) ->
-          g = res.body
-          userInGroup = _.find g.members, (member) -> return member._id == userToRemove._id
-          expect(userInGroup).to.not.exist
-          cb()
+          .end (res) -> cb()
 
       (cb) ->
         request.get(baseURL + "/user")
           .set("X-API-User", userToRemove._id)
           .set("X-API-Key", userToRemove.apiToken)
-            .end (res) ->
-              expect(res.body.newMessages[group._id]).to.not.exist
-              cb()
+          .end (res) ->
+            expect(res.body.newMessages[group._id]).to.not.exist
+            cb()
     ], done
diff --git a/website/src/controllers/groups.js b/website/src/controllers/groups.js
index ad84d03636..853fd427ac 100644
--- a/website/src/controllers/groups.js
+++ b/website/src/controllers/groups.js
@@ -756,8 +756,8 @@ api.removeMember = function(req, res, next){
 
         //Mark removed users messages as seen
         var update = {$unset:{}};
-        update['$unset']['newMessages.'+group._id] = '';
-        User.update({_id:removedUser._id, apiToken:removedUser.apiToken},update).exec();
+        update.$unset['newMessages.' + group._id] = '';
+        User.update({_id: removedUser._id, apiToken: removedUser.apiToken}, update).exec();
 
         // Sending an empty 204 because Group.update doesn't return the group
         // see http://mongoosejs.com/docs/api.html#model_Model.update