From dccbcb46d0c088f792a2bbd1e0b87aed86ebd30e Mon Sep 17 00:00:00 2001
From: TheHollidayInn <krh121791@gmail.com>
Date: Fri, 5 Jun 2015 20:27:00 -0500
Subject: [PATCH] Fixed member error and fixed inconsistency in party query
 tests

---
 test/api/groups.coffee | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/test/api/groups.coffee b/test/api/groups.coffee
index abf1875eff..6e06e4f3e0 100644
--- a/test/api/groups.coffee
+++ b/test/api/groups.coffee
@@ -318,13 +318,12 @@ describe "Groups", ->
         type: "party"
       ).end (res) ->
         expectCode res, 200
-
-        party = res.body[0]
+        party = _.find res.body, (g) -> return g._id == group._id
         expect(party._id).to.equal group._id
         expect(party.leader).to.equal user._id
         expect(party.name).to.equal group.name
         expect(party.quest).to.deep.equal { progress: {} }
-        #expect(party.memberCount).to.equal group.memberCount
+        expect(party.memberCount).to.equal group.memberCount
         done()
 
     it "prevents user from creating a second party", (done) ->
@@ -351,20 +350,35 @@ describe "Groups", ->
 
       it "allows users to join a party when they have been invited", (done) ->
         tmpUser = undefined
-        registerNewUser (err, user) ->
-          tmpUser = user
-          inviteURL = baseURL + "/groups/" + group._id + "/invite"
-          request.post(inviteURL).send(
-            uuids: [tmpUser._id]
-          )
-          .end ->
+        async.waterfall [
+          (cb) ->
+            registerNewUser(cb, false)
+
+          (user, cb) ->
+            tmpUser = user
+            inviteURL = baseURL + "/groups/" + group._id + "/invite"
+            request.post(inviteURL).send(
+              uuids: [tmpUser._id]
+            )
+            .end ->
+              cb()
+
+          (cb) ->
             request.post(baseURL + "/groups/" + group._id + "/join")
             .set("X-API-User", tmpUser._id)
             .set("X-API-Key", tmpUser.apiToken)
             .end (res) ->
               expectCode res, 200
-              done()
-        , false
+              cb()
+
+          (cb) ->
+            request.post(baseURL + "/groups/" + group._id + "/leave")
+            .set("X-API-User", tmpUser._id)
+            .set("X-API-Key", tmpUser.apiToken)
+            .end (res) ->
+              expectCode res, 204
+              cb()
+        ], done
 
     describe "Chat", ->
       chat = undefined