From b75adb4f3b30638071a7e42c2fd2561826118b02 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 17 Jan 2016 13:22:39 -0600 Subject: [PATCH] tests(api): Pull in theunknown's changes to createAndPopulateGroup https://github.com/KristianTashkov/habitrpg/commit/bf6814265c34b52b6efa565c60f3bb43da814164 --- .../api-integration/v3/object-generators.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/test/helpers/api-integration/v3/object-generators.js b/test/helpers/api-integration/v3/object-generators.js index f14ecdad67..81bb855d56 100644 --- a/test/helpers/api-integration/v3/object-generators.js +++ b/test/helpers/api-integration/v3/object-generators.js @@ -73,17 +73,20 @@ export async function createAndPopulateGroup (settings = {}) { let group = await generateGroup(groupLeader, groupDetails); let members = await Q.all( - times(numberOfMembers, () => { - return generateUser(); + times(numberOfMembers, async () => { + let user = await generateUser(); + + if (group.type === 'party') { + await user.update({ 'party._id': group._id}); + } else { + await user.update({ guilds: [group._id] }); + } + + return user; }) ); - let memberIds = members.map((member) => { - return member._id; - }); - memberIds.push(groupLeader._id); - - await group.update({ members: memberIds }); + group.update({ memberCount: numberOfMembers + 1}); let invitees = await Q.all( times(numberOfInvites, () => {