From 195fdce9ce3ca6b3e02a235174beca864386aef2 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 1 Jan 2016 19:33:23 -0600 Subject: [PATCH] tests(api): Update GET groups and GET groups id tests to use await --- test/api/v2/groups/GET-groups.test.js | 100 ++++------- test/api/v2/groups/GET-groups_id.test.js | 216 +++++++++++------------ 2 files changed, 139 insertions(+), 177 deletions(-) diff --git a/test/api/v2/groups/GET-groups.test.js b/test/api/v2/groups/GET-groups.test.js index ea881787f7..81f16c5a82 100644 --- a/test/api/v2/groups/GET-groups.test.js +++ b/test/api/v2/groups/GET-groups.test.js @@ -11,80 +11,59 @@ describe('GET /groups', () => { let user; before(async () => { - let leader, createdGroup; - // Set up a world with a mixture of public and private guilds // Invite user to a few of them - return resetHabiticaDB().then(() => { - return generateUser(); - }).then((_user) => { - user = _user; + await resetHabiticaDB(); - return generateUser({ - balance: 10, - }); - }).then((_user) => { - leader = _user; + user = await generateUser(); + let leader = await generateUser({ balance: 10 }); - let publicGuildWithUserAsMember = generateGroup(leader, { - name: 'public guild - is member', - type: 'guild', - privacy: 'public', - members: [leader._id, user._id], - }); + let publicGuildWithUserAsMember = await generateGroup(leader, { + name: 'public guild - is member', + type: 'guild', + privacy: 'public', + members: [leader._id, user._id], + }); - let publicGuildWithoutUserAsMember = generateGroup(leader, { - name: 'public guild - is not member', - type: 'guild', - privacy: 'public', - }); + let publicGuildWithoutUserAsMember = await generateGroup(leader, { + name: 'public guild - is not member', + type: 'guild', + privacy: 'public', + }); - let privateGuildWithUserAsMember = generateGroup(leader, { - name: 'private guild - is member', - type: 'guild', - privacy: 'private', - members: [leader._id, user._id], - }); + let privateGuildWithUserAsMember = await generateGroup(leader, { + name: 'private guild - is member', + type: 'guild', + privacy: 'private', + members: [leader._id, user._id], + }); - let privateGuildWithoutUserAsMember = generateGroup(leader, { - name: 'private guild - is not member', - type: 'guild', - privacy: 'private', - }); + let privateGuildWithoutUserAsMember = await generateGroup(leader, { + name: 'private guild - is not member', + type: 'guild', + privacy: 'private', + }); - let partyWithoutUserAsMember = generateGroup(leader, { - name: 'party name', - type: 'party', - privacy: 'private', - }); + let partyWithoutUserAsMember = await generateGroup(leader, { + name: 'party name', + type: 'party', + privacy: 'private', + }); - let promises = [ - publicGuildWithUserAsMember, - publicGuildWithoutUserAsMember, - privateGuildWithUserAsMember, - privateGuildWithoutUserAsMember, - partyWithoutUserAsMember, - ]; - - return Promise.all(promises); - }).then((groups) => { - return user.post('/groups', { - type: 'party', - name: 'user\'s party', - privacy: 'private', - }); + let usersParty = await user.post('/groups', { + type: 'party', + name: 'user\'s party', + privacy: 'private', }); }); context('no query passed in', () => { - xit('lists all public guilds, the tavern, user\'s party, and any private guilds that user is a part of - TODO query includes duplicates - IE, tavern is included as tavern and part of public guilds. Refactor so this is not the case'); }); context('tavern passed in as query', () => { - it('returns only the tavern', async () => { - return expect(user.get('/groups', null, {type: 'tavern'})) + await expect(user.get('/groups', null, {type: 'tavern'})) .to.eventually.have.a.lengthOf(1) .and.to.have.deep.property('[0]') .and.to.have.property('_id', 'habitrpg'); @@ -92,9 +71,8 @@ describe('GET /groups', () => { }); context('party passed in as query', () => { - it('returns only the user\'s party', async () => { - return expect(user.get('/groups', null, {type: 'party'})) + await expect(user.get('/groups', null, {type: 'party'})) .to.eventually.have.a.lengthOf(1) .and.to.have.deep.property('[0]') .and.to.have.property('leader', user._id); @@ -102,17 +80,15 @@ describe('GET /groups', () => { }); context('public passed in as query', () => { - it('returns all public guilds', async () => { - return expect(user.get('/groups', null, {type: 'public'})) + await expect(user.get('/groups', null, {type: 'public'})) .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS); }); }); context('guilds passed in as query', () => { - it('returns all guilds user is a part of ', async () => { - return expect(user.get('/groups', null, {type: 'guilds'})) + await expect(user.get('/groups', null, {type: 'guilds'})) .to.eventually.have.a.lengthOf(NUMBER_OF_USERS_GUILDS); }); }); diff --git a/test/api/v2/groups/GET-groups_id.test.js b/test/api/v2/groups/GET-groups_id.test.js index 5c6f6925b6..7ecc9dc319 100644 --- a/test/api/v2/groups/GET-groups_id.test.js +++ b/test/api/v2/groups/GET-groups_id.test.js @@ -20,59 +20,57 @@ describe('GET /groups/:id', () => { let leader, member, createdGroup; before(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ members: 30, groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - leader = res.leader; - member = res.members[0]; - createdGroup = res.group; }); + + leader = groupData.leader; + member = groupData.members[0]; + createdGroup = groupData.group; }); it('returns the group object', async () => { - return member.get(`/groups/${createdGroup._id}`).then((group) => { - expect(group._id).to.eql(createdGroup._id); - expect(group.name).to.eql(createdGroup.name); - expect(group.type).to.eql(createdGroup.type); - expect(group.privacy).to.eql(createdGroup.privacy); - }); + let group = await member.get(`/groups/${createdGroup._id}`); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); }); it('transforms members array to an array of user objects', async () => { - return member.get(`/groups/${createdGroup._id}`).then((group) => { - let member = group.members[0]; - expect(member._id).to.exist; - expect(member.profile.name).to.exist; - expect(member.contributor).to.exist; - expect(member.achievements).to.exist; - expect(member.items).to.exist; - }); + let group = await member.get(`/groups/${createdGroup._id}`); + let someMember = group.members[0]; + + expect(someMember._id).to.exist; + expect(someMember.profile.name).to.exist; + expect(someMember.contributor).to.exist; + expect(someMember.achievements).to.exist; + expect(someMember.items).to.exist; }); it('transforms leader id to leader object', async () => { - return member.get(`/groups/${createdGroup._id}`).then((group) => { - expect(group.leader._id).to.eql(leader._id); - expect(group.leader.profile.name).to.eql(leader.profile.name); - expect(group.leader.items).to.exist; - expect(group.leader.stats).to.exist; - expect(group.leader.achievements).to.exist; - expect(group.leader.contributor).to.exist; - }); + let group = await member.get(`/groups/${createdGroup._id}`); + + expect(group.leader._id).to.eql(leader._id); + expect(group.leader.profile.name).to.eql(leader.profile.name); + expect(group.leader.items).to.exist; + expect(group.leader.stats).to.exist; + expect(group.leader.achievements).to.exist; + expect(group.leader.contributor).to.exist; }); it('includes the user in the members list', async () => { - return member.get(`/groups/${createdGroup._id}`).then((group) => { - let members = group.members; - let userInGroup = find(members, (user) => { - return member._id === user._id; - }); - expect(userInGroup).to.be.ok; - }); + let group = await member.get(`/groups/${createdGroup._id}`); + let members = group.members; + let userInGroup = find(group.members, '_id', member._id); + + expect(userInGroup).to.be.exist; }); }); }); @@ -124,7 +122,7 @@ describe('GET /groups/:id', () => { }; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', @@ -137,9 +135,9 @@ describe('GET /groups/:id', () => { chat5, ], }, - }).then((res) => { - group = res.group; }); + + group = groupData.group; }); context('non-admin', () => { @@ -150,21 +148,21 @@ describe('GET /groups/:id', () => { }); it('does not include messages with a flag count of 2 or greater', async () => { - return nonAdmin.get(`/groups/${group._id}`).then((_group) => { - expect(_group.chat).to.have.lengthOf(3); - expect(_group.chat[0].id).to.eql(chat1.id); - expect(_group.chat[1].id).to.eql(chat2.id); - expect(_group.chat[2].id).to.eql(chat3.id); - }); + let fetchedGroup = await nonAdmin.get(`/groups/${group._id}`); + + expect(fetchedGroup.chat).to.have.lengthOf(3); + expect(fetchedGroup.chat[0].id).to.eql(chat1.id); + expect(fetchedGroup.chat[1].id).to.eql(chat2.id); + expect(fetchedGroup.chat[2].id).to.eql(chat3.id); }); it('does not include user ids in flags object', async () => { - return nonAdmin.get(`/groups/${group._id}`).then((_group) => { - let chatWithOneFlag = _group.chat[2]; - expect(chatWithOneFlag.id).to.eql(chat3.id); - expect(chat3.flags).to.eql({ 'user-id': true }); - expect(chatWithOneFlag.flags).to.eql({}); - }); + let fetchedGroup = await nonAdmin.get(`/groups/${group._id}`); + let chatWithOneFlag = fetchedGroup.chat[2]; + + expect(chatWithOneFlag.id).to.eql(chat3.id); + expect(chat3.flags).to.eql({ 'user-id': true }); + expect(chatWithOneFlag.flags).to.eql({}); }); }); @@ -172,31 +170,29 @@ describe('GET /groups/:id', () => { let admin; beforeEach(async () => { - return generateUser({ + admin = await generateUser({ 'contributor.admin': true, - }).then((user) => { - admin = user; }); }); it('includes all messages', async () => { - return admin.get(`/groups/${group._id}`).then((_group) => { - expect(_group.chat).to.have.lengthOf(5); - expect(_group.chat[0].id).to.eql(chat1.id); - expect(_group.chat[1].id).to.eql(chat2.id); - expect(_group.chat[2].id).to.eql(chat3.id); - expect(_group.chat[3].id).to.eql(chat4.id); - expect(_group.chat[4].id).to.eql(chat5.id); - }); + let fetchedGroup = await admin.get(`/groups/${group._id}`); + + expect(fetchedGroup.chat).to.have.lengthOf(5); + expect(fetchedGroup.chat[0].id).to.eql(chat1.id); + expect(fetchedGroup.chat[1].id).to.eql(chat2.id); + expect(fetchedGroup.chat[2].id).to.eql(chat3.id); + expect(fetchedGroup.chat[3].id).to.eql(chat4.id); + expect(fetchedGroup.chat[4].id).to.eql(chat5.id); }); it('includes user ids in flags object', async () => { - return admin.get(`/groups/${group._id}`).then((_group) => { - let chatWithOneFlag = _group.chat[2]; - expect(chatWithOneFlag.id).to.eql(chat3.id); - expect(chat3.flags).to.eql({ 'user-id': true }); - expect(chatWithOneFlag.flags).to.eql(chat3.flags); - }); + let fetchedGroup = await admin.get(`/groups/${group._id}`); + let chatWithOneFlag = fetchedGroup.chat[2]; + + expect(chatWithOneFlag.id).to.eql(chat3.id); + expect(chat3.flags).to.eql({ 'user-id': true }); + expect(chatWithOneFlag.flags).to.eql(chat3.flags); }); }); }); @@ -205,39 +201,34 @@ describe('GET /groups/:id', () => { let leader, nonMember, createdGroup; before(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - return generateUser(); - }).then((user) => { - nonMember = user; }); + + leader = groupData.leader; + createdGroup = groupData.group; + nonMember = await generateUser(); }); it('returns the group object for a non-member', async () => { - return nonMember.get(`/groups/${createdGroup._id}`) - .then((group) => { - expect(group._id).to.eql(createdGroup._id); - expect(group.name).to.eql(createdGroup.name); - expect(group.type).to.eql(createdGroup.type); - expect(group.privacy).to.eql(createdGroup.privacy); - }); + let group = await nonMember.get(`/groups/${createdGroup._id}`); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); }); it('does not include user in members list', async () => { - return nonMember.get(`/groups/${createdGroup._id}`).then((group) => { - let userInGroup = find(group.members, (user) => { - return nonMember._id === user._id; - }); - expect(userInGroup).to.not.be.ok; - }); + let group = await nonMember.get(`/groups/${createdGroup._id}`); + let userInGroup = find(group.members, '_id', nonMember._id); + + expect(userInGroup).to.not.exist; }); }); @@ -245,24 +236,22 @@ describe('GET /groups/:id', () => { let leader, nonMember, createdGroup; before(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test guild', type: 'guild', privacy: 'private', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - return generateUser(); - }).then((user) => { - nonMember = user; }); + + leader = groupData.leader; + createdGroup = groupData.group; + nonMember = await generateUser(); }); it('does not return the group object for a non-member', async () => { - return expect(nonMember.get(`/groups/${createdGroup._id}`)) + await expect(nonMember.get(`/groups/${createdGroup._id}`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'), @@ -274,24 +263,22 @@ describe('GET /groups/:id', () => { let leader, nonMember, createdGroup; before(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test party', type: 'party', privacy: 'private', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - return generateUser(); - }).then((user) => { - nonMember = user; }); + + leader = groupData.leader; + createdGroup = groupData.group; + nonMember = await generateUser(); }); it('does not return the group object for a non-member', async () => { - return expect(nonMember.get(`/groups/${createdGroup._id}`)) + await expect(nonMember.get(`/groups/${createdGroup._id}`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'), @@ -303,28 +290,27 @@ describe('GET /groups/:id', () => { let leader, member, createdGroup; before(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test party', type: 'party', privacy: 'private', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - member = res.members[0]; }); + + leader = groupData.leader; + createdGroup = groupData.group; + member = groupData.members[0]; }); it('returns the user\'s party if an id of "party" is passed in', async () => { - return member.get('/groups/party') - .then((group) => { - expect(group._id).to.eql(createdGroup._id); - expect(group.name).to.eql(createdGroup.name); - expect(group.type).to.eql(createdGroup.type); - expect(group.privacy).to.eql(createdGroup.privacy); - }); + let group = await member.get('/groups/party') + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); }); }); @@ -336,7 +322,7 @@ describe('GET /groups/:id', () => { }); it('returns error if group does not exist', async () => { - return expect(user.get('/groups/group-that-does-not-exist')) + await expect(user.get('/groups/group-that-does-not-exist')) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'),