From dc3407e1af3157bea6104f94653885f262ec7e31 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 30 Dec 2015 08:44:02 -0600 Subject: [PATCH] tests(api): Convert groups tests to use user['HTTP_METHOD'] syntax --- test/api/v3/integration/chat/GET-chat.test.js | 8 ++-- .../integration/chat/POST-chat.flag.test.js | 39 +++++++------------ .../integration/chat/POST-chat.like.test.js | 33 +++++++--------- .../api/v3/integration/chat/POST-chat.test.js | 31 +++++++-------- .../v3/integration/groups/POST-groups.test.js | 24 ++++-------- 5 files changed, 53 insertions(+), 82 deletions(-) diff --git a/test/api/v3/integration/chat/GET-chat.test.js b/test/api/v3/integration/chat/GET-chat.test.js index 5681c8b818..26ed88f70b 100644 --- a/test/api/v3/integration/chat/GET-chat.test.js +++ b/test/api/v3/integration/chat/GET-chat.test.js @@ -1,17 +1,15 @@ import { generateUser, generateGroup, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('GET /groups/:groupId/chat', () => { - let user, api; + let user; before(() => { return generateUser().then((generatedUser) => { user = generatedUser; - api = requester(user); }); }); @@ -38,7 +36,7 @@ describe('GET /groups/:groupId/chat', () => { }); it('returns Guild chat', () => { - return api.get('/groups/' + group._id + '/chat') + return user.get('/groups/' + group._id + '/chat') .then((getChat) => { expect(getChat).to.eql(group.chat); }); @@ -69,7 +67,7 @@ describe('GET /groups/:groupId/chat', () => { it('returns error if user is not member of requested private group', () => { return expect( - api.get('/groups/' + group._id + '/chat') + user.get('/groups/' + group._id + '/chat') ) .to.eventually.be.rejected.and.eql({ code: 404, diff --git a/test/api/v3/integration/chat/POST-chat.flag.test.js b/test/api/v3/integration/chat/POST-chat.flag.test.js index 5f4954d28a..c5178b7af8 100644 --- a/test/api/v3/integration/chat/POST-chat.flag.test.js +++ b/test/api/v3/integration/chat/POST-chat.flag.test.js @@ -1,13 +1,11 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; import _ from 'lodash'; describe('POST /chat/:chatId/flag', () => { let user; - let api; let group; let testMessage = 'Test Message'; @@ -18,10 +16,9 @@ describe('POST /chat/:chatId/flag', () => { return generateUser({balance: 1}).then((generatedUser) => { user = generatedUser; - api = requester(user); }) .then(() => { - return api.post('/groups', { + return user.post('/groups', { name: groupName, type: groupType, privacy: groupPrivacy, @@ -33,7 +30,7 @@ describe('POST /chat/:chatId/flag', () => { }); it('Returns an error when chat message is not found', () => { - return expect(api.post(`/groups/${group._id}/chat/incorrectMessage/flag`)) + return expect(user.post(`/groups/${group._id}/chat/incorrectMessage/flag`)) .to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', @@ -42,9 +39,9 @@ describe('POST /chat/:chatId/flag', () => { }); it('Returns an error when user tries to flag their own message', () => { - return api.post(`/groups/${group._id}/chat`, { message: testMessage}) + return user.post(`/groups/${group._id}/chat`, { message: testMessage}) .then((result) => { - return expect(api.post(`/groups/${group._id}/chat/${result.message.id}/flag`)) + return expect(user.post(`/groups/${group._id}/chat/${result.message.id}/flag`)) .to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', @@ -54,21 +51,19 @@ describe('POST /chat/:chatId/flag', () => { }); it('Flags a chat', () => { - let api2; let message; - return generateUser().then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post(`/groups/${group._id}/chat`, { message: testMessage}); + return generateUser().then((anotherUser) => { + return anotherUser.post(`/groups/${group._id}/chat`, { message: testMessage}); }) .then((result) => { message = result.message; - return api.post(`/groups/${group._id}/chat/${message.id}/flag`); + return user.post(`/groups/${group._id}/chat/${message.id}/flag`); }) .then((result) => { expect(result.flags[user._id]).to.equal(true); expect(result.flagCount).to.equal(1); - return api.get(`/groups/${group._id}`); + return user.get(`/groups/${group._id}`); }) .then((updatedGroup) => { let messageToCheck = _.find(updatedGroup.chat, {id: message.id}); @@ -77,23 +72,21 @@ describe('POST /chat/:chatId/flag', () => { }); it('Flags a chat with a higher flag acount when an admin flags the message', () => { - let api2; let secondUser; let message; return generateUser({'contributor.admin': true}).then((generatedUser) => { secondUser = generatedUser; - api2 = requester(generatedUser); - return api.post(`/groups/${group._id}/chat`, { message: testMessage}); + return user.post(`/groups/${group._id}/chat`, { message: testMessage}); }) .then((result) => { message = result.message; - return api2.post(`/groups/${group._id}/chat/${message.id}/flag`); + return secondUser.post(`/groups/${group._id}/chat/${message.id}/flag`); }) .then((result) => { expect(result.flags[secondUser._id]).to.equal(true); expect(result.flagCount).to.equal(5); - return api.get(`/groups/${group._id}`); + return user.get(`/groups/${group._id}`); }) .then((updatedGroup) => { let messageToCheck = _.find(updatedGroup.chat, {id: message.id}); @@ -103,19 +96,17 @@ describe('POST /chat/:chatId/flag', () => { }); it('Returns an error when user tries to flag a message that is already flagged', () => { - let api2; let message; - return generateUser().then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post(`/groups/${group._id}/chat`, { message: testMessage}); + return generateUser().then((anotherUser) => { + return anotherUser.post(`/groups/${group._id}/chat`, { message: testMessage}); }) .then((result) => { message = result.message; - return api.post(`/groups/${group._id}/chat/${message.id}/flag`); + return user.post(`/groups/${group._id}/chat/${message.id}/flag`); }) .then(() => { - return expect(api.post(`/groups/${group._id}/chat/${message.id}/flag`)) + return expect(user.post(`/groups/${group._id}/chat/${message.id}/flag`)) .to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', diff --git a/test/api/v3/integration/chat/POST-chat.like.test.js b/test/api/v3/integration/chat/POST-chat.like.test.js index cda9df4e1c..40f530174c 100644 --- a/test/api/v3/integration/chat/POST-chat.like.test.js +++ b/test/api/v3/integration/chat/POST-chat.like.test.js @@ -1,13 +1,11 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; import _ from 'lodash'; describe('POST /chat/:chatId/like', () => { let user; - let api; let group; let testMessage = 'Test Message'; @@ -18,10 +16,9 @@ describe('POST /chat/:chatId/like', () => { return generateUser({balance: 1}).then((generatedUser) => { user = generatedUser; - api = requester(user); }) .then(() => { - return api.post('/groups', { + return user.post('/groups', { name: groupName, type: groupType, privacy: groupPrivacy, @@ -33,7 +30,7 @@ describe('POST /chat/:chatId/like', () => { }); it('Returns an error when chat message is not found', () => { - return expect(api.post(`/groups/${group._id}/chat/incorrectMessage/like`)) + return expect(user.post(`/groups/${group._id}/chat/incorrectMessage/like`)) .to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', @@ -42,9 +39,9 @@ describe('POST /chat/:chatId/like', () => { }); it('Returns an error when user tries to like their own message', () => { - return api.post(`/groups/${group._id}/chat`, { message: testMessage}) + return user.post(`/groups/${group._id}/chat`, { message: testMessage}) .then((result) => { - return expect(api.post(`/groups/${group._id}/chat/${result.message.id}/like`)) + return expect(user.post(`/groups/${group._id}/chat/${result.message.id}/like`)) .to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', @@ -54,20 +51,18 @@ describe('POST /chat/:chatId/like', () => { }); it('Likes a chat', () => { - let api2; let message; - return generateUser().then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post(`/groups/${group._id}/chat`, { message: testMessage}); + return generateUser().then((anotherUser) => { + return anotherUser.post(`/groups/${group._id}/chat`, { message: testMessage}); }) .then((result) => { message = result.message; - return api.post(`/groups/${group._id}/chat/${message.id}/like`); + return user.post(`/groups/${group._id}/chat/${message.id}/like`); }) .then((result) => { expect(result.likes[user._id]).to.equal(true); - return api.get(`/groups/${group._id}`); + return user.get(`/groups/${group._id}`); }) .then((updatedGroup) => { let messageToCheck = _.find(updatedGroup.chat, {id: message.id}); @@ -76,24 +71,22 @@ describe('POST /chat/:chatId/like', () => { }); it('Unlikes a chat', () => { - let api2; let message; - return generateUser().then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post(`/groups/${group._id}/chat`, { message: testMessage}); + return generateUser().then((anotherUser) => { + return anotherUser.post(`/groups/${group._id}/chat`, { message: testMessage}); }) .then((result) => { message = result.message; - return api.post(`/groups/${group._id}/chat/${message.id}/like`); + return user.post(`/groups/${group._id}/chat/${message.id}/like`); }) .then((result) => { expect(result.likes[user._id]).to.equal(true); - return api.post(`/groups/${group._id}/chat/${message.id}/like`); + return user.post(`/groups/${group._id}/chat/${message.id}/like`); }) .then((result) => { expect(result.likes[user._id]).to.equal(false); - return api.get(`/groups/${group._id}`); + return user.get(`/groups/${group._id}`); }) .then((updatedGroup) => { let messageToCheck = _.find(updatedGroup.chat, {id: message.id}); diff --git a/test/api/v3/integration/chat/POST-chat.test.js b/test/api/v3/integration/chat/POST-chat.test.js index f427ac460d..37403ed12d 100644 --- a/test/api/v3/integration/chat/POST-chat.test.js +++ b/test/api/v3/integration/chat/POST-chat.test.js @@ -1,17 +1,14 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /chat', () => { let user; - let api; before(() => { return generateUser().then((generatedUser) => { user = generatedUser; - api = requester(user); }); }); @@ -20,18 +17,16 @@ describe('POST /chat', () => { let groupType = 'guild'; let groupPrivacy = 'public'; let testMessage = ''; - let api2; - return generateUser({balance: 1}).then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post('/groups', { + return generateUser({balance: 1}).then((anotherUser) => { + return anotherUser.post('/groups', { name: groupName, type: groupType, privacy: groupPrivacy, }); }) .then((group) => { - return expect(api.post(`/groups/${group._id}/chat`, { message: testMessage})) + return expect(user.post(`/groups/${group._id}/chat`, { message: testMessage})) .to.eventually.be.rejected.and.eql({ code: 400, error: 'BadRequest', @@ -42,7 +37,7 @@ describe('POST /chat', () => { it('Returns an error when group is not found', () => { let testMessage = 'Test Message'; - return expect(api.post('/groups/nvalidID/chat', { message: testMessage})).to.eventually.be.rejected.and.eql({ + return expect(user.post('/groups/nvalidID/chat', { message: testMessage})).to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', message: t('groupNotFound'), @@ -54,18 +49,19 @@ describe('POST /chat', () => { let groupType = 'guild'; let groupPrivacy = 'public'; let testMessage = 'Test Message'; - let api2; + let userWithoutChat; return generateUser({balance: 1, 'flags.chatRevoked': true}).then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post('/groups', { + userWithoutChat = generatedUser; + + return userWithoutChat.post('/groups', { name: groupName, type: groupType, privacy: groupPrivacy, }); }) .then((group) => { - return expect(api2.post(`/groups/${group._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({ + return expect(userWithoutChat.post(`/groups/${group._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({ code: 404, error: 'NotFound', message: 'Your chat privileges have been revoked.', @@ -78,18 +74,19 @@ describe('POST /chat', () => { let groupType = 'guild'; let groupPrivacy = 'public'; let testMessage = 'Test Message'; - let api2; + let anotherUser; return generateUser({balance: 1}).then((generatedUser) => { - api2 = requester(generatedUser); - return api2.post('/groups', { + anotherUser = generatedUser; + + return anotherUser.post('/groups', { name: groupName, type: groupType, privacy: groupPrivacy, }); }) .then((group) => { - return api2.post(`/groups/${group._id}/chat`, { message: testMessage}); + return anotherUser.post(`/groups/${group._id}/chat`, { message: testMessage}); }) .then((result) => { expect(result.message.id).to.exist; diff --git a/test/api/v3/integration/groups/POST-groups.test.js b/test/api/v3/integration/groups/POST-groups.test.js index 85269fe6b7..f77e0fb5ae 100644 --- a/test/api/v3/integration/groups/POST-groups.test.js +++ b/test/api/v3/integration/groups/POST-groups.test.js @@ -1,16 +1,14 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /group', () => { - let user, api; + let user; beforeEach(() => { return generateUser().then((generatedUser) => { user = generatedUser; - api = requester(user); }); }); @@ -20,7 +18,7 @@ describe('POST /group', () => { let groupType = 'guild'; return expect( - api.post('/groups', { + user.post('/groups', { name: groupName, type: groupType }) @@ -38,8 +36,7 @@ describe('POST /group', () => { let groupType = 'guild'; return generateUser({balance: 1}).then((generatedUser) => { - let api2 = requester(generatedUser); - return api2.post('/groups', { + return generatedUser.post('/groups', { name: groupName, type: groupType }); @@ -60,8 +57,7 @@ describe('POST /group', () => { let tmpUser; return generateUser({balance: 1}).then((generatedUser) => { - let api2 = requester(generatedUser); - return api2.post('/groups', { + return generatedUser.post('/groups', { name: groupName, type: groupType, privacy: groupPrivacy @@ -82,7 +78,7 @@ describe('POST /group', () => { let groupName = "Test Party"; let groupType = "party"; - return api.post('/groups', { + return user.post('/groups', { name: groupName, type: groupType }) @@ -93,28 +89,24 @@ describe('POST /group', () => { }) }); - it('prevents user in a party from creating a party', () => { + 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; - api = requester(tmpUser); - return api.post('/groups', { + return tmpUser.post('/groups', { name: groupName, type: groupType }); }) .then(() => { - return expect(api.post('/groups')).to.eventually.be.rejected.and.eql({ + return expect(tmpUser.post('/groups')).to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', message: t('messageGroupAlreadyInParty'), }); - }) - .then(() => { - api = requester(user); }); }); });