From ffbd4696e32b6ba813e11f54cd7108457462a0a8 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Mon, 11 Jan 2016 12:35:46 -0600 Subject: [PATCH] Converted posts tests to async/await syntax and updated tests --- common/locales/en/api-v3.json | 3 +- .../v3/integration/groups/POST-groups.test.js | 167 ++++++++++-------- website/src/controllers/api-v3/groups.js | 1 + 3 files changed, 101 insertions(+), 70 deletions(-) diff --git a/common/locales/en/api-v3.json b/common/locales/en/api-v3.json index 2ace1f7773..1f77e456aa 100644 --- a/common/locales/en/api-v3.json +++ b/common/locales/en/api-v3.json @@ -46,5 +46,6 @@ "winnerIdRequired": "\"winnerId\" must be a valid UUID.", "challengeNotFound": "Challenge not found.", "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", - "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge." + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "partyMustbePrivate": "Parties must be private" } diff --git a/test/api/v3/integration/groups/POST-groups.test.js b/test/api/v3/integration/groups/POST-groups.test.js index 0d3a622581..f0ac8b9aba 100644 --- a/test/api/v3/integration/groups/POST-groups.test.js +++ b/test/api/v3/integration/groups/POST-groups.test.js @@ -6,21 +6,34 @@ import { describe('POST /group', () => { let user; - beforeEach(() => { - return generateUser().then((generatedUser) => { - user = generatedUser; + beforeEach(async () => { + user = await generateUser(); + }); + + context('All Groups', () => { + it('it returns validation error when type is not provided', async () => { + let userToCreateGroup = await generateUser({balance: 1}); + await expect(userToCreateGroup.post('/groups', { name: 'Test Group Without Type' })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Group validation failed', + }); }); }); context('Guilds', () => { - it('returns an error when a user with insufficient funds attempts to create a guild', () => { - let groupName = 'Test Public Guild'; - let groupType = 'guild'; + let userToCreateGuild; - return expect( + beforeEach(async () => { + userToCreateGuild = await generateUser({balance: 1}); + }); + + it('returns an error when a user with insufficient funds attempts to create a guild', async () => { + await expect( user.post('/groups', { - name: groupName, - type: groupType, + name: 'Test Public Guild', + type: 'guild', }) ) .to.eventually.be.rejected.and.eql({ @@ -31,84 +44,100 @@ describe('POST /group', () => { }); context('public guild', () => { - it('creates a group', () => { + it('creates a group', async () => { let groupName = 'Test Public Guild'; let groupType = 'guild'; - - return generateUser({balance: 1}).then((generatedUser) => { - return generatedUser.post('/groups', { - name: groupName, - type: groupType, - }); - }) - .then((result) => { - expect(result._id).to.exist; - expect(result.name).to.equal(groupName); - expect(result.type).to.equal(groupType); - expect(result.memberCount).to.equal(1); + let groupPrivacy = 'public'; + let publicGuild = await userToCreateGuild.post('/groups', { + name: groupName, + type: groupType, + privacy: groupPrivacy, }); + + expect(publicGuild._id).to.exist; + expect(publicGuild.name).to.equal(groupName); + expect(publicGuild.type).to.equal(groupType); + expect(publicGuild.memberCount).to.equal(1); + expect(publicGuild.privacy).to.equal(groupPrivacy); }); }); context('private guild', () => { - it('creates a group', () => { - let groupName = 'Test Private Guild'; - let groupType = 'guild'; - let groupPrivacy = 'private'; + let groupName = 'Test Private Guild'; + let groupType = 'guild'; + let groupPrivacy = 'private'; - return generateUser({balance: 1}).then((generatedUser) => { - return generatedUser.post('/groups', { - name: groupName, - type: groupType, - privacy: groupPrivacy, - }); - }) - .then((result) => { - expect(result._id).to.exist; - expect(result.name).to.equal(groupName); - expect(result.type).to.equal(groupType); - expect(result.memberCount).to.equal(1); - expect(result.privacy).to.equal(groupPrivacy); + it('creates a group', async () => { + let privateGuild = await userToCreateGuild.post('/groups', { + name: groupName, + type: groupType, + privacy: groupPrivacy, }); + + expect(privateGuild._id).to.exist; + expect(privateGuild.name).to.equal(groupName); + expect(privateGuild.type).to.equal(groupType); + expect(privateGuild.memberCount).to.equal(1); + expect(privateGuild.privacy).to.equal(groupPrivacy); + }); + + it('deducts gems from user and adds them to guild bank', async () => { + let privateGuild = await userToCreateGuild.post('/groups', { + name: groupName, + type: groupType, + privacy: groupPrivacy, + }); + + expect(privateGuild.balance).to.eql(1); + + let updatedUser = await userToCreateGuild.get('/user'); + + expect(updatedUser.balance).to.eql(0); }); }); }); context('Parties', () => { - it('creates a party', () => { - let groupName = 'Test Party'; - let groupType = 'party'; + let partyName = 'Test Party'; + let partyType = 'party'; - return user.post('/groups', { - name: groupName, - type: groupType, - }) - .then((result) => { - expect(result._id).to.exist; - expect(result.name).to.equal(groupName); - expect(result.type).to.equal(groupType); - expect(result.memberCount).to.equal(1); + it('creates a party', async () => { + let party = await user.post('/groups', { + name: partyName, + type: partyType, + }); + + expect(party._id).to.exist; + expect(party.name).to.equal(partyName); + expect(party.type).to.equal(partyType); + expect(party.memberCount).to.equal(1); + }); + + it('prevents user in a party from creating another party', async () => { + let userToCreateTwoParties = await generateUser(); + + await userToCreateTwoParties.post('/groups', { + name: partyName, + type: partyType, + }); + + await expect(userToCreateTwoParties.post('/groups')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupAlreadyInParty'), }); }); - it('prevents user in a party from creating another party', () => { - let tmpUser; - let groupName = 'Test Party'; - let groupType = 'party'; - - return generateUser().then((generatedUser) => { - tmpUser = generatedUser; - return tmpUser.post('/groups', { - name: groupName, - type: groupType, - }); - }) - .then(() => { - return expect(tmpUser.post('/groups')).to.eventually.be.rejected.and.eql({ - code: 401, - error: 'NotAuthorized', - message: t('messageGroupAlreadyInParty'), - }); + it('prevents creating a public party', async () => { + await expect(user.post('/groups', { + name: partyName, + type: partyType, + privacy: 'public', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('partyMustbePrivate'), }); }); }); diff --git a/website/src/controllers/api-v3/groups.js b/website/src/controllers/api-v3/groups.js index 80b2972217..8604337648 100644 --- a/website/src/controllers/api-v3/groups.js +++ b/website/src/controllers/api-v3/groups.js @@ -43,6 +43,7 @@ api.createGroup = { user.balance--; user.guilds.push(group._id); } else { + if (group.privacy === 'public') throw new NotAuthorized(res.t('partyMustbePrivate')); if (user.party._id) throw new NotAuthorized(res.t('messageGroupAlreadyInParty')); user.party._id = group._id;