From 116fffaf4ff05fad4e54b883633c5fd0daea03c6 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 2 Jan 2016 22:19:47 -0600 Subject: [PATCH] lint: Fix linting errors in api v2 tests --- test/api/v2/groups/GET-groups.test.js | 16 +-- test/api/v2/groups/GET-groups_id.test.js | 28 ++--- test/api/v2/groups/POST-groups.test.js | 3 +- test/api/v2/groups/POST-groups_id.test.js | 31 +++-- .../api/v2/groups/POST-groups_id_join.test.js | 94 ++++++--------- .../v2/groups/POST-groups_id_leave.test.js | 107 ++++++++---------- .../POST-groups_id_removeMember.test.js | 5 +- .../groups/chat/DELETE-groups_id_chat.test.js | 5 +- .../v2/groups/chat/GET-groups_id_chat.test.js | 41 +++---- .../groups/chat/POST-groups_id_chat.test.js | 2 - .../POST-groups_id_chat_id_clearflags.test.js | 17 ++- .../chat/POST-groups_id_chat_id_flag.test.js | 30 +++-- .../chat/POST-groups_id_chat_id_like.test.js | 26 ++--- test/api/v2/register/POST-register.test.js | 107 +++++++++--------- test/api/v2/user/DELETE-user.test.js | 30 +++-- test/api/v2/user/GET-user_tags_id.test.js | 2 +- test/api/v2/user/PUT-user.test.js | 16 +-- .../anonymized/GET-user_anonymized.test.js | 103 ++++++++--------- .../POST-user_batch-update.test.js | 27 ++--- .../api/v2/user/tasks/DELETE-tasks_id.test.js | 13 +-- test/api/v2/user/tasks/GET-tasks.test.js | 1 - test/api/v2/user/tasks/POST-tasks.test.js | 1 - test/api/v2/user/tasks/PUT-tasks_id.test.js | 5 +- 23 files changed, 307 insertions(+), 403 deletions(-) diff --git a/test/api/v2/groups/GET-groups.test.js b/test/api/v2/groups/GET-groups.test.js index 81f16c5a82..0bf191acfb 100644 --- a/test/api/v2/groups/GET-groups.test.js +++ b/test/api/v2/groups/GET-groups.test.js @@ -18,41 +18,41 @@ describe('GET /groups', () => { user = await generateUser(); let leader = await generateUser({ balance: 10 }); - let publicGuildWithUserAsMember = await generateGroup(leader, { + await generateGroup(leader, { name: 'public guild - is member', type: 'guild', privacy: 'public', members: [leader._id, user._id], }); - let publicGuildWithoutUserAsMember = await generateGroup(leader, { + await generateGroup(leader, { name: 'public guild - is not member', type: 'guild', privacy: 'public', }); - let privateGuildWithUserAsMember = await generateGroup(leader, { + await generateGroup(leader, { name: 'private guild - is member', type: 'guild', privacy: 'private', members: [leader._id, user._id], }); - let privateGuildWithoutUserAsMember = await generateGroup(leader, { + await generateGroup(leader, { name: 'private guild - is not member', type: 'guild', privacy: 'private', }); - let partyWithoutUserAsMember = await generateGroup(leader, { - name: 'party name', + await generateGroup(leader, { + name: 'party - is not member', type: 'party', privacy: 'private', }); - let usersParty = await user.post('/groups', { + await user.post('/groups', { + name: 'party - is member', type: 'party', - name: 'user\'s party', privacy: 'private', }); }); diff --git a/test/api/v2/groups/GET-groups_id.test.js b/test/api/v2/groups/GET-groups_id.test.js index 531c050bde..54ce590222 100644 --- a/test/api/v2/groups/GET-groups_id.test.js +++ b/test/api/v2/groups/GET-groups_id.test.js @@ -5,28 +5,23 @@ import { } from '../../../helpers/api-integration.helper'; import { find, - each + each, } from 'lodash'; describe('GET /groups/:id', () => { - let typesOfGroups = {}; typesOfGroups['public guild'] = { type: 'guild', privacy: 'public' }; typesOfGroups['private guild'] = { type: 'guild', privacy: 'private' }; - typesOfGroups['party'] = { type: 'party', privacy: 'private' }; + typesOfGroups.party = { type: 'party', privacy: 'private' }; - each(typesOfGroups, (groupData, groupType) => { + each(typesOfGroups, (groupDetails, groupType) => { context(`Member of a ${groupType}`, () => { let leader, member, createdGroup; before(async () => { let groupData = await createAndPopulateGroup({ members: 30, - groupDetails: { - name: 'test guild', - type: 'guild', - privacy: 'public', - }, + groupDetails, }); leader = groupData.leader; @@ -67,10 +62,9 @@ describe('GET /groups/:id', () => { it('includes the user in the members list', async () => { 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; + expect(userInGroup).to.exist; }); }); }); @@ -198,7 +192,7 @@ describe('GET /groups/:id', () => { }); context('Non-member of a public guild', () => { - let leader, nonMember, createdGroup; + let nonMember, createdGroup; before(async () => { let groupData = await createAndPopulateGroup({ @@ -210,7 +204,6 @@ describe('GET /groups/:id', () => { }, }); - leader = groupData.leader; createdGroup = groupData.group; nonMember = await generateUser(); }); @@ -233,7 +226,7 @@ describe('GET /groups/:id', () => { }); context('Private Guilds', () => { - let leader, nonMember, createdGroup; + let nonMember, createdGroup; before(async () => { let groupData = await createAndPopulateGroup({ @@ -245,7 +238,6 @@ describe('GET /groups/:id', () => { }, }); - leader = groupData.leader; createdGroup = groupData.group; nonMember = await generateUser(); }); @@ -260,7 +252,7 @@ describe('GET /groups/:id', () => { }); context('Non-member of a party', () => { - let leader, nonMember, createdGroup; + let nonMember, createdGroup; before(async () => { let groupData = await createAndPopulateGroup({ @@ -272,7 +264,6 @@ describe('GET /groups/:id', () => { }, }); - leader = groupData.leader; createdGroup = groupData.group; nonMember = await generateUser(); }); @@ -287,7 +278,7 @@ describe('GET /groups/:id', () => { }); context('Member of a party', () => { - let leader, member, createdGroup; + let member, createdGroup; before(async () => { let groupData = await createAndPopulateGroup({ @@ -299,7 +290,6 @@ describe('GET /groups/:id', () => { }, }); - leader = groupData.leader; createdGroup = groupData.group; member = groupData.members[0]; }); diff --git a/test/api/v2/groups/POST-groups.test.js b/test/api/v2/groups/POST-groups.test.js index 75c4128921..d14ea1bee4 100644 --- a/test/api/v2/groups/POST-groups.test.js +++ b/test/api/v2/groups/POST-groups.test.js @@ -68,7 +68,8 @@ describe('POST /groups', () => { }); it('prevents party creation if user is already in party', async () => { - let party = await generateGroup(leader, { + await generateGroup(leader, { + name: 'first party that user attempts to create', type: 'party', }); diff --git a/test/api/v2/groups/POST-groups_id.test.js b/test/api/v2/groups/POST-groups_id.test.js index fd628505d1..eabf3e58c6 100644 --- a/test/api/v2/groups/POST-groups_id.test.js +++ b/test/api/v2/groups/POST-groups_id.test.js @@ -5,7 +5,6 @@ import { } from '../../../helpers/api-integration.helper'; describe('POST /groups/:id', () => { - context('user is not the leader of the group', () => { let user, otherUser, groupUserDoesNotOwn; @@ -30,7 +29,7 @@ describe('POST /groups/:id', () => { it('does not allow user to update group', async () => { return expect(user.post(`/groups/${groupUserDoesNotOwn._id}`, { - name: 'Change' + name: 'Change', })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupOnlyLeaderCanUpdate'), @@ -42,31 +41,27 @@ describe('POST /groups/:id', () => { let user, usersGroup; beforeEach(async () => { - return generateUser({ + user = await generateUser({ balance: 10, - }).then((_user) => { - user = _user; + }); - return generateGroup(user, { - name: 'Original Group Title', - type: 'guild', - privacy: 'public', - }); - }).then((group) => { - usersGroup = group; + usersGroup = await generateGroup(user, { + name: 'Original Group Title', + type: 'guild', + privacy: 'public', }); }); it('allows user to update group', async () => { - return user.post(`/groups/${usersGroup._id}`, { + await user.post(`/groups/${usersGroup._id}`, { name: 'New Group Title', description: 'New group description', - }).then((group) => { - return user.get(`/groups/${usersGroup._id}`); - }).then((group) => { - expect(group.name).to.eql('New Group Title'); - expect(group.description).to.eql('New group description'); }); + + let group = await user.get(`/groups/${usersGroup._id}`); + + expect(group.name).to.eql('New Group Title'); + expect(group.description).to.eql('New group description'); }); }); }); diff --git a/test/api/v2/groups/POST-groups_id_join.test.js b/test/api/v2/groups/POST-groups_id_join.test.js index 4016ea1853..1c21fe8a58 100644 --- a/test/api/v2/groups/POST-groups_id_join.test.js +++ b/test/api/v2/groups/POST-groups_id_join.test.js @@ -6,7 +6,6 @@ import { import { each, find } from 'lodash'; describe('POST /groups/:id/join', () => { - context('user is already a member of the group', () => { it('returns an error'); }); @@ -14,64 +13,48 @@ describe('POST /groups/:id/join', () => { each({ 'public guild': {type: 'guild', privacy: 'public'}, 'private guild': {type: 'guild', privacy: 'private'}, - 'party': {type: 'party', privacy: 'private'}, - }, (data, groupType) => { + party: {type: 'party', privacy: 'private'}, + }, (groupDetails, groupType) => { context(`user has invitation to a ${groupType}`, () => { let group, invitee; beforeEach(async () => { - return createAndPopulateGroup({ - groupDetails: { - type: data.type, - privacy: data.privacy, - }, + let groupData = await createAndPopulateGroup({ + groupDetails, invites: 1, - }).then((res) => { - group = res.group; - invitee = res.invitees[0]; }); + group = groupData.group; + invitee = groupData.invitees[0]; }); it(`allows user to join a ${groupType}`, async () => { - return invitee.post(`/groups/${group._id}/join`).then((res) => { - return invitee.get(`/groups/${group._id}`); - }).then((_group) => { - let members = _group.members; - let userInGroup = find(members, (user) => { - return user._id === invitee._id; - }); + await invitee.post(`/groups/${group._id}/join`); - expect(userInGroup).to.exist; - }); + let members = (await invitee.get(`/groups/${group._id}`)).members; + let userInGroup = find(members, '_id', invitee._id); + + expect(userInGroup).to.exist; }); }); }); each({ 'private guild': {type: 'guild', privacy: 'private'}, - 'party': {type: 'party', privacy: 'private'}, - }, (data, groupType) => { + party: {type: 'party', privacy: 'private'}, + }, (groupDetails, groupType) => { context(`user does not have an invitation to a ${groupType}`, () => { let group, user; beforeEach(async () => { - return createAndPopulateGroup({ - groupDetails: { - type: data.type, - privacy: data.privacy, - }, - }).then((res) => { - group = res.group; - return generateUser(); - }).then((generatedUser) => { - user = generatedUser; + let groupData = await createAndPopulateGroup({ + groupDetails, }); + group = groupData.group; + user = await generateUser(); }); it(`does not allow user to join a ${groupType}`, async () => { - return expect(user.post(`/groups/${group._id}/join`).then((res) => { - return user.get(`/groups/${group._id}`); - })).to.eventually.be.rejected.and.eql({ + await expect(user.post(`/groups/${group._id}/join`)).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupRequiresInvite'), }); @@ -83,30 +66,23 @@ describe('POST /groups/:id/join', () => { let group, user; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ groupDetails: { type: 'guild', privacy: 'public', }, - }).then((res) => { - group = res.group; - return generateUser(); - }).then((generatedUser) => { - user = generatedUser; }); + group = groupData.group; + user = await generateUser(); }); it('allows user to join a public guild', async () => { - return user.post(`/groups/${group._id}/join`).then((res) => { - return user.get(`/groups/${group._id}`); - }).then((_group) => { - let members = _group.members; - let userInGroup = find(members, (member) => { - return user._id === user._id; - }); + await user.post(`/groups/${group._id}/join`); - expect(userInGroup).to.exist; - }); + let members = (await user.get(`/groups/${group._id}`)).members; + let userInGroup = find(members, '_id', user._id); + + expect(userInGroup).to.exist; }); }); @@ -114,26 +90,22 @@ describe('POST /groups/:id/join', () => { let user, group; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - group = res.group; - return res.leader.post(`/groups/${group._id}/leave`); - }).then((res) => { - return generateUser(); - }).then((generatedUser) => { - user = generatedUser; }); + group = groupData.group; + await groupData.leader.post(`/groups/${group._id}/leave`); + user = await generateUser(); }); it('makes the joining user the leader', async () => { - return expect(user.post(`/groups/${group._id}/join`).then((result) => { - return user.get(`/groups/${group._id}`); - })).to.eventually.have.deep.property('leader._id', user._id); + await user.post(`/groups/${group._id}/join`); + + await expect(user.get(`/groups/${group._id}`)).to.eventually.have.deep.property('leader._id', user._id); }); }); }); diff --git a/test/api/v2/groups/POST-groups_id_leave.test.js b/test/api/v2/groups/POST-groups_id_leave.test.js index 31bdbf2c8b..dcfa3077f1 100644 --- a/test/api/v2/groups/POST-groups_id_leave.test.js +++ b/test/api/v2/groups/POST-groups_id_leave.test.js @@ -1,13 +1,10 @@ import { checkExistence, createAndPopulateGroup, - generateUser, - translate as t, } from '../../../helpers/api-integration.helper'; import { find } from 'lodash'; describe('POST /groups/:id/leave', () => { - context('user is not member of the group', () => { it('returns an error'); }); @@ -16,28 +13,26 @@ describe('POST /groups/:id/leave', () => { let user, group; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ members: 3, groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - user = res.members[0]; - group = res.group; }); + + user = groupData.members[0]; + group = groupData.group; }); it('leaves the group', async () => { - return user.post(`/groups/${group._id}/leave`).then((result) => { - return user.get(`/groups/${group._id}`); - }).then((group) => { - let userInGroup = find(group.members, (member) => { - return member._id === user._id; - }); - expect(userInGroup).to.not.be.ok; - }); + await user.post(`/groups/${group._id}/leave`); + + let members = (await user.get(`/groups/${group._id}`)).members; + let userInGroup = find(members, '_id', user._id); + + expect(userInGroup).to.not.be.ok; }); }); @@ -45,22 +40,22 @@ describe('POST /groups/:id/leave', () => { let user, group; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - user = res.leader; - group = res.group; }); + + user = groupData.leader; + group = groupData.group; }); it('leaves the group accessible', async () => { - return expect(user.post(`/groups/${group._id}/leave`).then((result) => { - return user.get(`/groups/${group._id}`); - })).to.eventually.have.property('_id', group._id); + await user.post(`/groups/${group._id}/leave`); + + await expect(user.get(`/groups/${group._id}`)).to.eventually.have.property('_id', group._id); }); }); @@ -68,22 +63,22 @@ describe('POST /groups/:id/leave', () => { let user, group; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', privacy: 'private', }, - }).then((res) => { - user = res.leader; - group = res.group; }); + + user = groupData.leader; + group = groupData.group; }); it('group is deleted', async () => { - return expect(user.post(`/groups/${group._id}/leave`).then((result) => { - return checkExistence('groups', group._id); - })).to.eventually.eql(false); + await user.post(`/groups/${group._id}/leave`); + + await expect(checkExistence('groups', group._id)).to.eventually.eql(false); }); }); @@ -91,32 +86,26 @@ describe('POST /groups/:id/leave', () => { let user, invitee1, invitee2, group; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ invites: 2, groupDetails: { name: 'test guild', type: 'guild', privacy: 'private', }, - }).then((res) => { - user = res.leader; - invitee1 = res.invitees[0]; - invitee2 = res.invitees[1]; - group = res.group; }); + + user = groupData.leader; + group = groupData.group; + invitee1 = groupData.invitees[0]; + invitee2 = groupData.invitees[1]; }); it('deletes the group invitations from users', async () => { - return user.post(`/groups/${group._id}/leave`).then((result) => { - return Promise.all([ - expect(invitee1.get(`/user`)) - .to.eventually.have.deep.property('invitations.guilds') - .and.to.be.empty, - expect(invitee2.get(`/user`)) - .to.eventually.have.deep.property('invitations.guilds') - .and.to.be.empty, - ]); - }); + await user.post(`/groups/${group._id}/leave`); + + await expect(invitee1.get(`/user`)).to.eventually.have.deep.property('invitations.guilds').and.to.be.empty; + await expect(invitee2.get(`/user`)).to.eventually.have.deep.property('invitations.guilds').and.to.be.empty; }); }); @@ -124,32 +113,26 @@ describe('POST /groups/:id/leave', () => { let user, invitee1, invitee2, group; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ invites: 2, groupDetails: { - name: 'test party', + name: 'test guild', type: 'party', privacy: 'private', }, - }).then((res) => { - user = res.leader; - invitee1 = res.invitees[0]; - invitee2 = res.invitees[1]; - group = res.group; }); + + user = groupData.leader; + group = groupData.group; + invitee1 = groupData.invitees[0]; + invitee2 = groupData.invitees[1]; }); it('deletes the group invitations from users', async () => { - return user.post(`/groups/${group._id}/leave`).then((result) => { - return Promise.all([ - expect(invitee1.get(`/user`)) - .to.eventually.have.deep.property('invitations.party') - .and.to.be.empty, - expect(invitee2.get(`/user`)) - .to.eventually.have.deep.property('invitations.party') - .and.to.be.empty, - ]); - }); + await user.post(`/groups/${group._id}/leave`); + + await expect(invitee1.get(`/user`)).to.eventually.have.deep.property('invitations.party').and.to.be.empty; + await expect(invitee2.get(`/user`)).to.eventually.have.deep.property('invitations.party').and.to.be.empty; }); }); }); diff --git a/test/api/v2/groups/POST-groups_id_removeMember.test.js b/test/api/v2/groups/POST-groups_id_removeMember.test.js index 9cbd090222..757ac6bcba 100644 --- a/test/api/v2/groups/POST-groups_id_removeMember.test.js +++ b/test/api/v2/groups/POST-groups_id_removeMember.test.js @@ -1,12 +1,9 @@ import { createAndPopulateGroup, - generateGroup, - generateUser, translate as t, } from '../../../helpers/api-integration.helper'; describe('POST /groups/:id/removeMember', () => { - context('user is not member of the group', () => { it('returns an error'); }); @@ -45,7 +42,7 @@ describe('POST /groups/:id/removeMember', () => { it('can remove other members of guild', async () => { return leader.post(`/groups/${group._id}/removeMember`, null, { uuid: member._id, - }).then((res) => { + }).then(() => { return leader.get(`/groups/${group._id}`); }).then((guild) => { expect(guild.members).to.have.a.lengthOf(1); diff --git a/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js b/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js index 964159c1bf..cf9f519032 100644 --- a/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js +++ b/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js @@ -1,6 +1,5 @@ import { createAndPopulateGroup, - generateUser, translate as t, } from '../../../../helpers/api-integration.helper'; @@ -17,14 +16,14 @@ describe('DELETE /groups/:id/chat', () => { group = res.group; user = res.leader; - return user.post(`/groups/${group._id}/chat`, null, { message: 'Some message', }); + return user.post(`/groups/${group._id}/chat`, null, { message: 'Some message' }); }).then((res) => { message = res.message; }); }); it('deletes a message', async () => { - return user.del(`/groups/${group._id}/chat/${message.id}`).then((res) => { + return user.del(`/groups/${group._id}/chat/${message.id}`).then(() => { return user.get(`/groups/${group._id}/chat/`); }).then((messages) => { expect(messages).to.have.length(0); diff --git a/test/api/v2/groups/chat/GET-groups_id_chat.test.js b/test/api/v2/groups/chat/GET-groups_id_chat.test.js index fac510bb03..2095d16987 100644 --- a/test/api/v2/groups/chat/GET-groups_id_chat.test.js +++ b/test/api/v2/groups/chat/GET-groups_id_chat.test.js @@ -1,45 +1,38 @@ import { createAndPopulateGroup, - generateUser, - translate as t, } from '../../../../helpers/api-integration.helper'; describe('GET /groups/:id/chat', () => { - context('group with multiple messages', () => { - let group, member, message1, message2, user; + let group, member, user; beforeEach(async () => { - return createAndPopulateGroup({ + let groupData = await createAndPopulateGroup({ groupDetails: { type: 'guild', privacy: 'public', }, members: 1, - }).then((res) => { - group = res.group; - user = res.leader; - member = res.members[0]; - - return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); - }).then((res) => { - message1 = res.message; - - return user.post(`/groups/${group._id}/chat`, null, { message: 'User message' }); - }).then((res) => { - message2 = res.message; }); + + group = groupData.group; + user = groupData.leader; + member = groupData.members[0]; + + await member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); + await user.post(`/groups/${group._id}/chat`, null, { message: 'User message' }); }); it('gets messages', async () => { - return user.get(`/groups/${group._id}/chat`).then((messages) => { - expect(messages).to.have.length(2); + let messages = await user.get(`/groups/${group._id}/chat`); - let message = messages[0]; - expect(message.id).to.exist; - expect(message.text).to.exist; - expect(message.uuid).to.exist; - }); + expect(messages).to.have.length(2); + + let message = messages[0]; + + expect(message.id).to.exist; + expect(message.text).to.exist; + expect(message.uuid).to.exist; }); }); }); diff --git a/test/api/v2/groups/chat/POST-groups_id_chat.test.js b/test/api/v2/groups/chat/POST-groups_id_chat.test.js index 781d5e7bc4..4cb2c21dfa 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat.test.js @@ -1,11 +1,9 @@ import { createAndPopulateGroup, - generateUser, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat', () => { - let group, user; beforeEach(async () => { diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js index 10aa6b9d83..8a84fa300c 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js @@ -53,7 +53,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { }); it('clears flags', async () => { - return admin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then((res) => { + return admin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then(() => { return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages[0].flagCount).to.eql(0); @@ -61,7 +61,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { }); it('leaves old flags on the flag object', async () => { - return admin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then((res) => { + return admin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then(() => { return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages[0].flags).to.have.property('some-id', true); @@ -78,7 +78,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { }); context('admin user, group with multiple messages', () => { - let admin, author, group, member; + let admin, author, groupWithMessages; beforeEach(async () => { author = await generateUser(); @@ -92,21 +92,20 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { privacy: 'public', chat: [ { id: 'message-to-unflag', uuid: author._id, flagCount: 1, flags: {'some-user': true} }, - { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { 'id1': true } }, - { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } }, + { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { id1: true } }, + { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } }, { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, ], }, members: 1, }); - group = groupData.group; - member = groupData.members[0]; + groupWithMessages = groupData.group; }); it('changes only the message that is flagged', async () => { - return admin.post(`/groups/${group._id}/chat/message-to-unflag/clearflags`).then((messages) => { - return admin.get(`/groups/${group._id}/chat`); + return admin.post(`/groups/${groupWithMessages._id}/chat/message-to-unflag/clearflags`).then(() => { + return admin.get(`/groups/${groupWithMessages._id}/chat`); }).then((messages) => { expect(messages).to.have.lengthOf(4); diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js index eff1be3c32..0f064ba6b3 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js @@ -5,7 +5,6 @@ import { } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat/:id/flag', () => { - context('another member\'s message', () => { let group, member, message, user; @@ -21,23 +20,22 @@ describe('POST /groups/:id/chat/:id/flag', () => { user = res.leader; member = res.members[0]; - return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message', }); + return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); }).then((res) => { message = res.message; }); }); it('flags message', async () => { - return user.post(`/groups/${group._id}/chat/${message.id}/flag`).then((messages) => { + return user.post(`/groups/${group._id}/chat/${message.id}/flag`).then(() => { return user.get(`/groups/${group._id}/chat`); }).then((messages) => { - let message = messages[0]; - expect(message.flagCount).to.eql(1); + expect(messages[0].flagCount).to.eql(1); }); }); it('cannot flag the same message twice', async () => { - return expect(user.post(`/groups/${group._id}/chat/${message.id}/flag`).then((messages) => { + return expect(user.post(`/groups/${group._id}/chat/${message.id}/flag`).then(() => { return user.post(`/groups/${group._id}/chat/${message.id}/flag`); })).to.eventually.be.rejected.and.eql({ code: 401, @@ -60,7 +58,7 @@ describe('POST /groups/:id/chat/:id/flag', () => { group = res.group; user = res.leader; - return user.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message', }); + return user.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message' }); }).then((res) => { message = res.message; }); @@ -76,7 +74,7 @@ describe('POST /groups/:id/chat/:id/flag', () => { }); context('nonexistant message', () => { - let group, message, user; + let group, user; beforeEach(async () => { return createAndPopulateGroup({ @@ -100,7 +98,7 @@ describe('POST /groups/:id/chat/:id/flag', () => { }); context('group with multiple messages', () => { - let admin, author, group, member, message, user; + let admin, author, group, user; beforeEach(async () => { author = await generateUser(); @@ -114,8 +112,8 @@ describe('POST /groups/:id/chat/:id/flag', () => { privacy: 'public', chat: [ { id: 'message-to-be-flagged', uuid: author._id, flagCount: 0, flags: {} }, - { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { 'id1': true } }, - { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } }, + { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { id1: true } }, + { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } }, { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, ], }, @@ -124,11 +122,10 @@ describe('POST /groups/:id/chat/:id/flag', () => { group = groupData.group; user = groupData.leader; - member = groupData.members[0]; }); it('changes only the message that is flagged', async () => { - return user.post(`/groups/${group._id}/chat/message-to-be-flagged/flag`).then((messages) => { + return user.post(`/groups/${group._id}/chat/message-to-be-flagged/flag`).then(() => { return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages).to.have.lengthOf(4); @@ -172,18 +169,17 @@ describe('POST /groups/:id/chat/:id/flag', () => { user = res.leader; member = res.members[0]; - return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message', }); + return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); }).then((res) => { message = res.message; }); }); it('sets flagCount to 5', async () => { - return user.post(`/groups/${group._id}/chat/${message.id}/flag`).then((messages) => { + return user.post(`/groups/${group._id}/chat/${message.id}/flag`).then(() => { return user.get(`/groups/${group._id}/chat`); }).then((messages) => { - let message = messages[0]; - expect(message.flagCount).to.eql(5); + expect(messages[0].flagCount).to.eql(5); }); }); }); diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js index d1736e3f7e..cf0e5aae75 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js @@ -5,7 +5,6 @@ import { } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat/:id/like', () => { - context('another member\'s message', () => { let group, member, message, user; @@ -21,7 +20,7 @@ describe('POST /groups/:id/chat/:id/like', () => { user = res.leader; member = res.members[0]; - return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message', }); + return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); }).then((res) => { message = res.message; }); @@ -29,17 +28,15 @@ describe('POST /groups/:id/chat/:id/like', () => { it('likes message', async () => { return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { - let message = messages[0]; - expect(message.likes[user._id]).to.eql(true); + expect(messages[0].likes[user._id]).to.eql(true); }); }); it('returns the message object', async () => { return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { - let message = messages[0]; - expect(message.text).to.eql('Group member message'); - expect(message.uuid).to.eql(member._id); - expect(message.user).to.eql(member.profile.name); + expect(messages[0].text).to.eql('Group member message'); + expect(messages[0].uuid).to.eql(member._id); + expect(messages[0].user).to.eql(member.profile.name); }); }); }); @@ -58,7 +55,7 @@ describe('POST /groups/:id/chat/:id/like', () => { group = res.group; user = res.leader; - return user.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message', }); + return user.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message' }); }).then((res) => { message = res.message; }); @@ -74,7 +71,7 @@ describe('POST /groups/:id/chat/:id/like', () => { }); context('group with multiple messages', () => { - let admin, author, group, member, message, user; + let admin, author, group, user; beforeEach(async () => { author = await generateUser(); @@ -88,8 +85,8 @@ describe('POST /groups/:id/chat/:id/like', () => { privacy: 'public', chat: [ { id: 'message-to-be-liked', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, - { id: '1-like-message', likes: { 'id': true }, uuid: author._id, flagCount: 1, flags: { 'id1': true } }, - { id: '2-like-message', likes: { 'id': true, 'id2': true }, uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } }, + { id: '1-like-message', likes: { id: true }, uuid: author._id, flagCount: 1, flags: { id1: true } }, + { id: '2-like-message', likes: { id: true, id2: true }, uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } }, { id: 'no-likes', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, ], }, @@ -98,11 +95,10 @@ describe('POST /groups/:id/chat/:id/like', () => { group = groupData.group; user = groupData.leader; - member = groupData.members[0]; }); it('changes only the message that is liked', async () => { - return user.post(`/groups/${group._id}/chat/message-to-be-liked/like`).then((messages) => { + return user.post(`/groups/${group._id}/chat/message-to-be-liked/like`).then(() => { return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages).to.have.lengthOf(4); @@ -128,7 +124,7 @@ describe('POST /groups/:id/chat/:id/like', () => { }); context('nonexistant message', () => { - let group, message, user; + let group, user; beforeEach(async () => { return createAndPopulateGroup({ diff --git a/test/api/v2/register/POST-register.test.js b/test/api/v2/register/POST-register.test.js index a49d4aa67d..d62e15787f 100644 --- a/test/api/v2/register/POST-register.test.js +++ b/test/api/v2/register/POST-register.test.js @@ -7,7 +7,6 @@ import { v4 as generateRandomUserName } from 'uuid'; import { each } from 'lodash'; describe('POST /register', () => { - context('username and email are free', () => { it('registers a new user', async () => { let api = requester(); @@ -16,9 +15,9 @@ describe('POST /register', () => { let password = 'password'; return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user._id).to.exist; @@ -35,10 +34,10 @@ describe('POST /register', () => { let confirmPassword = 'not password'; return expect(api.post('/register', { - username: username, - email: email, - password: password, - confirmPassword: confirmPassword, + username, + email, + password, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthPasswordMustMatch'), @@ -52,9 +51,9 @@ describe('POST /register', () => { let confirmPassword = 'password'; return expect(api.post('/register', { - email: email, - password: password, - confirmPassword: confirmPassword, + email, + password, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthCredentialsRequired'), @@ -68,9 +67,9 @@ describe('POST /register', () => { let confirmPassword = 'password'; return expect(api.post('/register', { - username: username, - password: password, - confirmPassword: confirmPassword, + username, + password, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthCredentialsRequired'), @@ -84,9 +83,9 @@ describe('POST /register', () => { let confirmPassword = 'password'; return expect(api.post('/register', { - username: username, - email: email, - confirmPassword: confirmPassword, + username, + email, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthCredentialsRequired'), @@ -102,7 +101,7 @@ describe('POST /register', () => { return generateUser({ 'auth.local.username': username, 'auth.local.lowerCaseUsername': username, - 'auth.local.email': email + 'auth.local.email': email, }); }); @@ -112,9 +111,9 @@ describe('POST /register', () => { let password = 'password'; return expect(api.post('/register', { - username: username, - email: uniqueEmail, - password: password, + username, + email: uniqueEmail, + password, confirmPassword: password, })).to.eventually.be.rejected.and.eql({ code: 401, @@ -128,9 +127,9 @@ describe('POST /register', () => { let password = 'password'; return expect(api.post('/register', { - username: uniqueUsername, - email: email, - password: password, + username: uniqueUsername, + email, + password, confirmPassword: password, })).to.eventually.be.rejected.and.eql({ code: 401, @@ -151,14 +150,14 @@ describe('POST /register', () => { it('sets all site tour values to -2 (already seen)', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.flags.tour).to.not.be.empty; - each(user.flags.tour, (value, attribute) => { + each(user.flags.tour, (value) => { expect(value).to.eql(-2); }); }); @@ -166,9 +165,9 @@ describe('POST /register', () => { it('populates user with default todos, not no other task types', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.todos).to.not.be.empty; @@ -180,9 +179,9 @@ describe('POST /register', () => { it('populates user with default tags', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.tags).to.not.be.empty; @@ -202,14 +201,14 @@ describe('POST /register', () => { it('sets all common tutorial flags to true', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.flags.tour).to.not.be.empty; - each(user.flags.tutorial.common, (value, attribute) => { + each(user.flags.tutorial.common, (value) => { expect(value).to.eql(true); }); }); @@ -217,9 +216,9 @@ describe('POST /register', () => { it('populates user with default todos, habits, and rewards', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.todos).to.not.be.empty; @@ -231,9 +230,9 @@ describe('POST /register', () => { it('populates user with default tags', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.tags).to.not.be.empty; @@ -253,14 +252,14 @@ describe('POST /register', () => { it('sets all common tutorial flags to true', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.flags.tour).to.not.be.empty; - each(user.flags.tutorial.common, (value, attribute) => { + each(user.flags.tutorial.common, (value) => { expect(value).to.eql(true); }); }); @@ -268,9 +267,9 @@ describe('POST /register', () => { it('populates user with default todos, habits, and rewards', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.todos).to.not.be.empty; @@ -282,9 +281,9 @@ describe('POST /register', () => { it('populates user with default tags', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.tags).to.not.be.empty; diff --git a/test/api/v2/user/DELETE-user.test.js b/test/api/v2/user/DELETE-user.test.js index fca6d81b6e..416bdcbfee 100644 --- a/test/api/v2/user/DELETE-user.test.js +++ b/test/api/v2/user/DELETE-user.test.js @@ -3,7 +3,6 @@ import { createAndPopulateGroup, generateGroup, generateUser, - translate as t, } from '../../../helpers/api-integration.helper'; import { find } from 'lodash'; @@ -15,7 +14,7 @@ describe('DELETE /user', () => { }); it('deletes the user', async () => { - return expect(user.del('/user').then((fetchedUser) => { + return expect(user.del('/user').then(() => { return checkExistence('users', user._id); })).to.eventually.eql(false); }); @@ -30,16 +29,16 @@ describe('DELETE /user', () => { beforeEach(async () => { return generateGroup(user, { type: 'party', - privacy: 'private' + privacy: 'private', }).then((group) => { party = group; }); }); it('deletes party when user is the only member', async () => { - return expect(user.del('/user').then((result) => { - return checkExistence('groups', party._id); - })).to.eventually.eql(false); + return expect(user.del('/user').then(() => { + return checkExistence('groups', party._id); + })).to.eventually.eql(false); }); }); @@ -49,16 +48,16 @@ describe('DELETE /user', () => { beforeEach(async () => { return generateGroup(user, { type: 'guild', - privacy: 'private' + privacy: 'private', }).then((group) => { guild = group; }); }); it('deletes guild when user is the only member', async () => { - return expect(user.del('/user').then((result) => { - return checkExistence('groups', guild._id); - })).to.eventually.eql(false); + return expect(user.del('/user').then(() => { + return checkExistence('groups', guild._id); + })).to.eventually.eql(false); }); }); @@ -80,7 +79,7 @@ describe('DELETE /user', () => { }); it('chooses new group leader for any group user was the leader of', async () => { - return oldLeader.del('/user').then((res) => { + return oldLeader.del('/user').then(() => { return newLeader.get(`/groups/${group._id}`); }).then((guild) => { expect(guild.leader).to.exist; @@ -95,8 +94,8 @@ describe('DELETE /user', () => { beforeEach(async () => { return generateUser({ balance: 10, - }).then((user) => { - userToDelete = user; + }).then((_user) => { + userToDelete = _user; return generateGroup(userToDelete, { type: 'guild', @@ -121,7 +120,7 @@ describe('DELETE /user', () => { }); it('removes user from all groups user was a part of', async () => { - return userToDelete.del('/user').then((res) => { + return userToDelete.del('/user').then(() => { return otherUser.get(`/groups/${group1._id}`); }).then((fetchedGroup1) => { expect(fetchedGroup1.members).to.be.empty; @@ -137,7 +136,6 @@ describe('DELETE /user', () => { expect(userInGroup).to.not.be.ok; }); }); - }); context('pending invitation to group', () => { @@ -159,7 +157,7 @@ describe('DELETE /user', () => { }); it('removes invitations from groups', async () => { - return userToDelete.del('/user').then((res) => { + return userToDelete.del('/user').then(() => { return otherUser.get(`/groups/${group._id}`); }).then((fetchedGroup) => { expect(fetchedGroup.invites).to.have.a.lengthOf(1); diff --git a/test/api/v2/user/GET-user_tags_id.test.js b/test/api/v2/user/GET-user_tags_id.test.js index 1c6f76ded1..0ea13437a7 100644 --- a/test/api/v2/user/GET-user_tags_id.test.js +++ b/test/api/v2/user/GET-user_tags_id.test.js @@ -11,7 +11,7 @@ describe('GET /user/tags/id', () => { }); it('gets a user\'s tag by id', async () => { - return expect(user.get('/user/tags/' + user.tags[0].id)) + return expect(user.get(`/user/tags/${user.tags[0].id}`)) .to.eventually.eql(user.tags[0]); }); diff --git a/test/api/v2/user/PUT-user.test.js b/test/api/v2/user/PUT-user.test.js index 17a6e27400..2e50a37650 100644 --- a/test/api/v2/user/PUT-user.test.js +++ b/test/api/v2/user/PUT-user.test.js @@ -15,7 +15,7 @@ describe('PUT /user', () => { context('allowed operations', () => { it('updates the user', async () => { let updatedUser = await user.put('/user', { - 'profile.name' : 'Frodo', + 'profile.name': 'Frodo', 'preferences.costume': true, 'stats.hp': 14, }); @@ -29,19 +29,19 @@ describe('PUT /user', () => { context('top level protected operations', () => { let protectedOperations = { 'gem balance': {balance: 100}, - 'auth': {'auth.blocked': true, 'auth.timestamps.created': new Date()}, - 'contributor': {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'}, - 'backer': {'backer.tier': 10, 'backer.npc': 'Bilbo'}, - 'subscriptions': {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000}, + auth: {'auth.blocked': true, 'auth.timestamps.created': new Date()}, + contributor: {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'}, + backer: {'backer.tier': 10, 'backer.npc': 'Bilbo'}, + subscriptions: {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000}, 'customization gem purchases': {'purchased.background.tavern': true, 'purchased.skin.bear': true}, - 'tasks': {todos: [], habits: [], dailys: [], rewards: []}, + tasks: {todos: [], habits: [], dailys: [], rewards: []}, }; each(protectedOperations, (data, testName) => { it(`does not allow updating ${testName}`, async () => { let errorText = []; each(data, (value, operation) => { - errorText.push(t('messageUserOperationProtected', { operation: operation })); + errorText.push(t('messageUserOperationProtected', { operation })); }); await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({ @@ -61,7 +61,7 @@ describe('PUT /user', () => { it(`does not allow updating ${testName}`, async () => { let errorText = []; each(data, (value, operation) => { - errorText.push(t('messageUserOperationProtected', { operation: operation })); + errorText.push(t('messageUserOperationProtected', { operation })); }); await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({ diff --git a/test/api/v2/user/anonymized/GET-user_anonymized.test.js b/test/api/v2/user/anonymized/GET-user_anonymized.test.js index 9a4a4aa0cc..6933074046 100644 --- a/test/api/v2/user/anonymized/GET-user_anonymized.test.js +++ b/test/api/v2/user/anonymized/GET-user_anonymized.test.js @@ -4,80 +4,77 @@ import { import { each } from 'lodash'; describe('GET /user/anonymized', () => { - let user; + let user, anonymizedUser; before(async () => { - return generateUser({ - 'inbox.messages' : { - 'the-message-id' : { - sort : 214, - user : 'Some user', - backer : {}, - contributor : { - text : 'Blacksmith', - level : 2, - contributions : 'Made some contributions', - admin : false + user = await generateUser({ + 'inbox.messages': { + 'the-message-id': { + sort: 214, + user: 'Some user', + backer: {}, + contributor: { + text: 'Blacksmith', + level: 2, + contributions: 'Made some contributions', + admin: false, }, - uuid : 'some-users-uuid', - flagCount : 0, - flags : {}, - likes : {}, - timestamp : 1444154258699.0000000000000000, - text : 'Lorem ipsum', - id : 'the-messages-id', - sent : true - } - } - }).then((usr) => { - user = usr; - return user.post('/user/tasks', { - text: 'some private text', - notes: 'some private notes', - checklist: [ - {text: 'a private checklist'}, - {text: 'another private checklist'}, - ], - type: 'daily', - }); - }).then((result) => { - return user.get('/user/anonymized'); - }).then((anonymizedUser) => { - user = anonymizedUser; + uuid: 'some-users-uuid', + flagCount: 0, + flags: {}, + likes: {}, + timestamp: 1444154258699.0000000000000000, + text: 'Lorem ipsum', + id: 'the-messages-id', + sent: true, + }, + }, }); + + await user.post('/user/tasks', { + text: 'some private text', + notes: 'some private notes', + checklist: [ + {text: 'a private checklist'}, + {text: 'another private checklist'}, + ], + type: 'daily', + }); + + anonymizedUser = await user.get('/user/anonymized'); }); it('retains user id', async () => { - expect(user._id).to.exist; + expect(anonymizedUser._id).to.eql(user._id); }); it('removes credentials and financial information', async () => { - expect(user.apiToken).to.not.exist; - expect(user.auth.local).to.not.exist; - expect(user.auth.facebook).to.not.exist; - expect(user.purchased.plan).to.not.exist; + expect(anonymizedUser.apiToken).to.not.exist; + expect(anonymizedUser.auth.local).to.not.exist; + expect(anonymizedUser.auth.facebook).to.not.exist; + expect(anonymizedUser.purchased.plan).to.not.exist; }); it('removes profile information', async () => { - expect(user.profile).to.not.exist; - expect(user.contributor).to.not.exist; - expect(user.achievements.challenges).to.not.exist; + expect(anonymizedUser.profile).to.not.exist; + expect(anonymizedUser.contributor).to.not.exist; + expect(anonymizedUser.achievements.challenges).to.not.exist; }); it('removes social information', async () => { - expect(user.newMessages).to.not.exist; - expect(user.invitations).to.not.exist; - expect(user.items.special.nyeReceived).to.not.exist; - expect(user.items.special.valentineReceived).to.not.exist; + expect(anonymizedUser.newMessages).to.not.exist; + expect(anonymizedUser.invitations).to.not.exist; + expect(anonymizedUser.items.special.nyeReceived).to.not.exist; + expect(anonymizedUser.items.special.valentineReceived).to.not.exist; - each(user.inbox.messages, (msg) => { + each(anonymizedUser.inbox.messages, (msg) => { expect(msg.text).to.eql('inbox message text'); }); }); it('anonymizes task info', async () => { each(['habits', 'todos', 'dailys', 'rewards'], (tasks) => { - each(user[tasks], (task) => { + each(anonymizedUser[tasks], (task) => { expect(task.text).to.eql('task text'); expect(task.notes).to.eql('task notes'); @@ -89,13 +86,13 @@ describe('GET /user/anonymized', () => { }); it('anonymizes tags', async () => { - each(user.tags, (tag) => { + each(anonymizedUser.tags, (tag) => { expect(tag.name).to.eql('tag'); expect(tag.challenge).to.eql('challenge'); }); }); it('removes webhooks', async () => { - expect(user.webhooks).to.not.exist; + expect(anonymizedUser.webhooks).to.not.exist; }); }); diff --git a/test/api/v2/user/batch-update/POST-user_batch-update.test.js b/test/api/v2/user/batch-update/POST-user_batch-update.test.js index 19c1f7b64b..7e7d9954f6 100644 --- a/test/api/v2/user/batch-update/POST-user_batch-update.test.js +++ b/test/api/v2/user/batch-update/POST-user_batch-update.test.js @@ -14,24 +14,20 @@ describe('POST /user/batch-update', () => { context('allowed operations', () => { it('makes batch operations', async () => { - let task; + let task = (await user.get('/user/tasks'))[0]; - return user.get('/user/tasks').then((tasks) => { - task = tasks[0]; + let updatedUser = await user.post('/user/batch-update', [ + {op: 'update', body: {'stats.hp': 30}}, + {op: 'update', body: {'profile.name': 'Samwise'}}, + {op: 'score', params: { direction: 'up', id: task.id }}, + ]); - return user.post('/user/batch-update', [ - {op: 'update', body: {'stats.hp': 30}}, - {op: 'update', body: {'profile.name': 'Samwise'}}, - {op: 'score', params: { direction: 'up', id: task.id }}, - ]); - }).then((updatedUser) => { - expect(updatedUser.stats.hp).to.eql(30); - expect(updatedUser.profile.name).to.eql('Samwise'); + expect(updatedUser.stats.hp).to.eql(30); + expect(updatedUser.profile.name).to.eql('Samwise'); - return user.get(`/user/tasks/${task.id}`); - }).then((task) => { - expect(task.value).to.be.greaterThan(0); - }); + let fetchedTask = await user.get(`/user/tasks/${task.id}`); + + expect(fetchedTask.value).to.be.greaterThan(task.value); }); }); @@ -42,7 +38,6 @@ describe('POST /user/batch-update', () => { }; each(protectedOperations, (operation, description) => { - it(`it sends back a 500 error for ${description} operation`, async () => { return expect(user.post('/user/batch-update', [ { op: operation }, diff --git a/test/api/v2/user/tasks/DELETE-tasks_id.test.js b/test/api/v2/user/tasks/DELETE-tasks_id.test.js index 9c734c2e83..2d0a1615d2 100644 --- a/test/api/v2/user/tasks/DELETE-tasks_id.test.js +++ b/test/api/v2/user/tasks/DELETE-tasks_id.test.js @@ -12,13 +12,12 @@ describe('DELETE /user/tasks/:id', () => { }); it('deletes a task', async () => { - return expect(user.del(`/user/tasks/${task.id}`) - .then((res) => { - return user.get(`/user/tasks/${task.id}`); - })).to.eventually.be.rejected.and.eql({ - code: 404, - text: t('messageTaskNotFound'), - }); + await user.del(`/user/tasks/${task.id}`); + + await expect(user.get(`/user/tasks/${task.id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + text: t('messageTaskNotFound'), + }); }); it('returns an error if the task does not exist', async () => { diff --git a/test/api/v2/user/tasks/GET-tasks.test.js b/test/api/v2/user/tasks/GET-tasks.test.js index 5ff1ff3192..3d750cab8c 100644 --- a/test/api/v2/user/tasks/GET-tasks.test.js +++ b/test/api/v2/user/tasks/GET-tasks.test.js @@ -1,6 +1,5 @@ import { generateUser, - translate as t, } from '../../../../helpers/api-integration.helper'; describe('GET /user/tasks/', () => { diff --git a/test/api/v2/user/tasks/POST-tasks.test.js b/test/api/v2/user/tasks/POST-tasks.test.js index 096c48678e..6ddc1d33fd 100644 --- a/test/api/v2/user/tasks/POST-tasks.test.js +++ b/test/api/v2/user/tasks/POST-tasks.test.js @@ -4,7 +4,6 @@ import { } from '../../../../helpers/api-integration.helper'; describe('POST /user/tasks', () => { - let user; beforeEach(async () => { diff --git a/test/api/v2/user/tasks/PUT-tasks_id.test.js b/test/api/v2/user/tasks/PUT-tasks_id.test.js index 7d63168d8e..90a5065db4 100644 --- a/test/api/v2/user/tasks/PUT-tasks_id.test.js +++ b/test/api/v2/user/tasks/PUT-tasks_id.test.js @@ -1,6 +1,5 @@ import { generateUser, - translate as t, } from '../../../../helpers/api-integration.helper'; describe('PUT /user/tasks/:id', () => { @@ -34,13 +33,13 @@ describe('PUT /user/tasks/:id', () => { text: 'new text', notes: 'new notes', value: 10000, - priority: .5, + priority: 0.5, attribute: 'str', }).then((updatedTask) => { expect(updatedTask.text).to.eql('new text'); expect(updatedTask.notes).to.eql('new notes'); expect(updatedTask.value).to.eql(10000); - expect(updatedTask.priority).to.eql(.5); + expect(updatedTask.priority).to.eql(0.5); expect(updatedTask.attribute).to.eql('str'); }); });