lint: Fix linting errors in api v2 tests

This commit is contained in:
Blade Barringer
2016-01-02 22:19:47 -06:00
parent ff1e5ef221
commit 116fffaf4f
23 changed files with 307 additions and 403 deletions

View File

@@ -18,41 +18,41 @@ describe('GET /groups', () => {
user = await generateUser(); user = await generateUser();
let leader = await generateUser({ balance: 10 }); let leader = await generateUser({ balance: 10 });
let publicGuildWithUserAsMember = await generateGroup(leader, { await generateGroup(leader, {
name: 'public guild - is member', name: 'public guild - is member',
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
members: [leader._id, user._id], members: [leader._id, user._id],
}); });
let publicGuildWithoutUserAsMember = await generateGroup(leader, { await generateGroup(leader, {
name: 'public guild - is not member', name: 'public guild - is not member',
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
}); });
let privateGuildWithUserAsMember = await generateGroup(leader, { await generateGroup(leader, {
name: 'private guild - is member', name: 'private guild - is member',
type: 'guild', type: 'guild',
privacy: 'private', privacy: 'private',
members: [leader._id, user._id], members: [leader._id, user._id],
}); });
let privateGuildWithoutUserAsMember = await generateGroup(leader, { await generateGroup(leader, {
name: 'private guild - is not member', name: 'private guild - is not member',
type: 'guild', type: 'guild',
privacy: 'private', privacy: 'private',
}); });
let partyWithoutUserAsMember = await generateGroup(leader, { await generateGroup(leader, {
name: 'party name', name: 'party - is not member',
type: 'party', type: 'party',
privacy: 'private', privacy: 'private',
}); });
let usersParty = await user.post('/groups', { await user.post('/groups', {
name: 'party - is member',
type: 'party', type: 'party',
name: 'user\'s party',
privacy: 'private', privacy: 'private',
}); });
}); });

View File

@@ -5,28 +5,23 @@ import {
} from '../../../helpers/api-integration.helper'; } from '../../../helpers/api-integration.helper';
import { import {
find, find,
each each,
} from 'lodash'; } from 'lodash';
describe('GET /groups/:id', () => { describe('GET /groups/:id', () => {
let typesOfGroups = {}; let typesOfGroups = {};
typesOfGroups['public guild'] = { type: 'guild', privacy: 'public' }; typesOfGroups['public guild'] = { type: 'guild', privacy: 'public' };
typesOfGroups['private guild'] = { type: 'guild', privacy: 'private' }; 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}`, () => { context(`Member of a ${groupType}`, () => {
let leader, member, createdGroup; let leader, member, createdGroup;
before(async () => { before(async () => {
let groupData = await createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
members: 30, members: 30,
groupDetails: { groupDetails,
name: 'test guild',
type: 'guild',
privacy: 'public',
},
}); });
leader = groupData.leader; leader = groupData.leader;
@@ -67,10 +62,9 @@ describe('GET /groups/:id', () => {
it('includes the user in the members list', async () => { it('includes the user in the members list', async () => {
let group = await member.get(`/groups/${createdGroup._id}`); let group = await member.get(`/groups/${createdGroup._id}`);
let members = group.members;
let userInGroup = find(group.members, '_id', member._id); 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', () => { context('Non-member of a public guild', () => {
let leader, nonMember, createdGroup; let nonMember, createdGroup;
before(async () => { before(async () => {
let groupData = await createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
@@ -210,7 +204,6 @@ describe('GET /groups/:id', () => {
}, },
}); });
leader = groupData.leader;
createdGroup = groupData.group; createdGroup = groupData.group;
nonMember = await generateUser(); nonMember = await generateUser();
}); });
@@ -233,7 +226,7 @@ describe('GET /groups/:id', () => {
}); });
context('Private Guilds', () => { context('Private Guilds', () => {
let leader, nonMember, createdGroup; let nonMember, createdGroup;
before(async () => { before(async () => {
let groupData = await createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
@@ -245,7 +238,6 @@ describe('GET /groups/:id', () => {
}, },
}); });
leader = groupData.leader;
createdGroup = groupData.group; createdGroup = groupData.group;
nonMember = await generateUser(); nonMember = await generateUser();
}); });
@@ -260,7 +252,7 @@ describe('GET /groups/:id', () => {
}); });
context('Non-member of a party', () => { context('Non-member of a party', () => {
let leader, nonMember, createdGroup; let nonMember, createdGroup;
before(async () => { before(async () => {
let groupData = await createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
@@ -272,7 +264,6 @@ describe('GET /groups/:id', () => {
}, },
}); });
leader = groupData.leader;
createdGroup = groupData.group; createdGroup = groupData.group;
nonMember = await generateUser(); nonMember = await generateUser();
}); });
@@ -287,7 +278,7 @@ describe('GET /groups/:id', () => {
}); });
context('Member of a party', () => { context('Member of a party', () => {
let leader, member, createdGroup; let member, createdGroup;
before(async () => { before(async () => {
let groupData = await createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
@@ -299,7 +290,6 @@ describe('GET /groups/:id', () => {
}, },
}); });
leader = groupData.leader;
createdGroup = groupData.group; createdGroup = groupData.group;
member = groupData.members[0]; member = groupData.members[0];
}); });

View File

@@ -68,7 +68,8 @@ describe('POST /groups', () => {
}); });
it('prevents party creation if user is already in party', async () => { 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', type: 'party',
}); });

View File

@@ -5,7 +5,6 @@ import {
} from '../../../helpers/api-integration.helper'; } from '../../../helpers/api-integration.helper';
describe('POST /groups/:id', () => { describe('POST /groups/:id', () => {
context('user is not the leader of the group', () => { context('user is not the leader of the group', () => {
let user, otherUser, groupUserDoesNotOwn; let user, otherUser, groupUserDoesNotOwn;
@@ -30,7 +29,7 @@ describe('POST /groups/:id', () => {
it('does not allow user to update group', async () => { it('does not allow user to update group', async () => {
return expect(user.post(`/groups/${groupUserDoesNotOwn._id}`, { return expect(user.post(`/groups/${groupUserDoesNotOwn._id}`, {
name: 'Change' name: 'Change',
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
text: t('messageGroupOnlyLeaderCanUpdate'), text: t('messageGroupOnlyLeaderCanUpdate'),
@@ -42,31 +41,27 @@ describe('POST /groups/:id', () => {
let user, usersGroup; let user, usersGroup;
beforeEach(async () => { beforeEach(async () => {
return generateUser({ user = await generateUser({
balance: 10, balance: 10,
}).then((_user) => { });
user = _user;
return generateGroup(user, { usersGroup = await generateGroup(user, {
name: 'Original Group Title', name: 'Original Group Title',
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
});
}).then((group) => {
usersGroup = group;
}); });
}); });
it('allows user to update group', async () => { it('allows user to update group', async () => {
return user.post(`/groups/${usersGroup._id}`, { await user.post(`/groups/${usersGroup._id}`, {
name: 'New Group Title', name: 'New Group Title',
description: 'New group description', 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');
}); });
}); });
}); });

View File

@@ -6,7 +6,6 @@ import {
import { each, find } from 'lodash'; import { each, find } from 'lodash';
describe('POST /groups/:id/join', () => { describe('POST /groups/:id/join', () => {
context('user is already a member of the group', () => { context('user is already a member of the group', () => {
it('returns an error'); it('returns an error');
}); });
@@ -14,64 +13,48 @@ describe('POST /groups/:id/join', () => {
each({ each({
'public guild': {type: 'guild', privacy: 'public'}, 'public guild': {type: 'guild', privacy: 'public'},
'private guild': {type: 'guild', privacy: 'private'}, 'private guild': {type: 'guild', privacy: 'private'},
'party': {type: 'party', privacy: 'private'}, party: {type: 'party', privacy: 'private'},
}, (data, groupType) => { }, (groupDetails, groupType) => {
context(`user has invitation to a ${groupType}`, () => { context(`user has invitation to a ${groupType}`, () => {
let group, invitee; let group, invitee;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails,
type: data.type,
privacy: data.privacy,
},
invites: 1, 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 () => { it(`allows user to join a ${groupType}`, async () => {
return invitee.post(`/groups/${group._id}/join`).then((res) => { await invitee.post(`/groups/${group._id}/join`);
return invitee.get(`/groups/${group._id}`);
}).then((_group) => {
let members = _group.members;
let userInGroup = find(members, (user) => {
return user._id === invitee._id;
});
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({ each({
'private guild': {type: 'guild', privacy: 'private'}, 'private guild': {type: 'guild', privacy: 'private'},
'party': {type: 'party', privacy: 'private'}, party: {type: 'party', privacy: 'private'},
}, (data, groupType) => { }, (groupDetails, groupType) => {
context(`user does not have an invitation to a ${groupType}`, () => { context(`user does not have an invitation to a ${groupType}`, () => {
let group, user; let group, user;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails,
type: data.type,
privacy: data.privacy,
},
}).then((res) => {
group = res.group;
return generateUser();
}).then((generatedUser) => {
user = generatedUser;
}); });
group = groupData.group;
user = await generateUser();
}); });
it(`does not allow user to join a ${groupType}`, async () => { it(`does not allow user to join a ${groupType}`, async () => {
return expect(user.post(`/groups/${group._id}/join`).then((res) => { await expect(user.post(`/groups/${group._id}/join`)).to.eventually.be.rejected.and.eql({
return user.get(`/groups/${group._id}`);
})).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
text: t('messageGroupRequiresInvite'), text: t('messageGroupRequiresInvite'),
}); });
@@ -83,30 +66,23 @@ describe('POST /groups/:id/join', () => {
let group, user; let group, user;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails: {
type: 'guild', type: 'guild',
privacy: 'public', 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 () => { it('allows user to join a public guild', async () => {
return user.post(`/groups/${group._id}/join`).then((res) => { await user.post(`/groups/${group._id}/join`);
return user.get(`/groups/${group._id}`);
}).then((_group) => {
let members = _group.members;
let userInGroup = find(members, (member) => {
return user._id === user._id;
});
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; let user, group;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails: {
name: 'test guild', name: 'test guild',
type: 'guild', type: 'guild',
privacy: 'public', 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 () => { it('makes the joining user the leader', async () => {
return expect(user.post(`/groups/${group._id}/join`).then((result) => { await user.post(`/groups/${group._id}/join`);
return user.get(`/groups/${group._id}`);
})).to.eventually.have.deep.property('leader._id', user._id); await expect(user.get(`/groups/${group._id}`)).to.eventually.have.deep.property('leader._id', user._id);
}); });
}); });
}); });

View File

@@ -1,13 +1,10 @@
import { import {
checkExistence, checkExistence,
createAndPopulateGroup, createAndPopulateGroup,
generateUser,
translate as t,
} from '../../../helpers/api-integration.helper'; } from '../../../helpers/api-integration.helper';
import { find } from 'lodash'; import { find } from 'lodash';
describe('POST /groups/:id/leave', () => { describe('POST /groups/:id/leave', () => {
context('user is not member of the group', () => { context('user is not member of the group', () => {
it('returns an error'); it('returns an error');
}); });
@@ -16,28 +13,26 @@ describe('POST /groups/:id/leave', () => {
let user, group; let user, group;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
members: 3, members: 3,
groupDetails: { groupDetails: {
name: 'test guild', name: 'test guild',
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
}, },
}).then((res) => {
user = res.members[0];
group = res.group;
}); });
user = groupData.members[0];
group = groupData.group;
}); });
it('leaves the group', async () => { it('leaves the group', async () => {
return user.post(`/groups/${group._id}/leave`).then((result) => { await user.post(`/groups/${group._id}/leave`);
return user.get(`/groups/${group._id}`);
}).then((group) => { let members = (await user.get(`/groups/${group._id}`)).members;
let userInGroup = find(group.members, (member) => { let userInGroup = find(members, '_id', user._id);
return member._id === user._id;
}); expect(userInGroup).to.not.be.ok;
expect(userInGroup).to.not.be.ok;
});
}); });
}); });
@@ -45,22 +40,22 @@ describe('POST /groups/:id/leave', () => {
let user, group; let user, group;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails: {
name: 'test guild', name: 'test guild',
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
}, },
}).then((res) => {
user = res.leader;
group = res.group;
}); });
user = groupData.leader;
group = groupData.group;
}); });
it('leaves the group accessible', async () => { it('leaves the group accessible', async () => {
return expect(user.post(`/groups/${group._id}/leave`).then((result) => { await user.post(`/groups/${group._id}/leave`);
return user.get(`/groups/${group._id}`);
})).to.eventually.have.property('_id', group._id); 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; let user, group;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails: {
name: 'test guild', name: 'test guild',
type: 'guild', type: 'guild',
privacy: 'private', privacy: 'private',
}, },
}).then((res) => {
user = res.leader;
group = res.group;
}); });
user = groupData.leader;
group = groupData.group;
}); });
it('group is deleted', async () => { it('group is deleted', async () => {
return expect(user.post(`/groups/${group._id}/leave`).then((result) => { await user.post(`/groups/${group._id}/leave`);
return checkExistence('groups', group._id);
})).to.eventually.eql(false); await expect(checkExistence('groups', group._id)).to.eventually.eql(false);
}); });
}); });
@@ -91,32 +86,26 @@ describe('POST /groups/:id/leave', () => {
let user, invitee1, invitee2, group; let user, invitee1, invitee2, group;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
invites: 2, invites: 2,
groupDetails: { groupDetails: {
name: 'test guild', name: 'test guild',
type: 'guild', type: 'guild',
privacy: 'private', 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 () => { it('deletes the group invitations from users', async () => {
return user.post(`/groups/${group._id}/leave`).then((result) => { await user.post(`/groups/${group._id}/leave`);
return Promise.all([
expect(invitee1.get(`/user`)) await expect(invitee1.get(`/user`)).to.eventually.have.deep.property('invitations.guilds').and.to.be.empty;
.to.eventually.have.deep.property('invitations.guilds') await expect(invitee2.get(`/user`)).to.eventually.have.deep.property('invitations.guilds').and.to.be.empty;
.and.to.be.empty,
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; let user, invitee1, invitee2, group;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
invites: 2, invites: 2,
groupDetails: { groupDetails: {
name: 'test party', name: 'test guild',
type: 'party', type: 'party',
privacy: 'private', 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 () => { it('deletes the group invitations from users', async () => {
return user.post(`/groups/${group._id}/leave`).then((result) => { await user.post(`/groups/${group._id}/leave`);
return Promise.all([
expect(invitee1.get(`/user`)) await expect(invitee1.get(`/user`)).to.eventually.have.deep.property('invitations.party').and.to.be.empty;
.to.eventually.have.deep.property('invitations.party') await expect(invitee2.get(`/user`)).to.eventually.have.deep.property('invitations.party').and.to.be.empty;
.and.to.be.empty,
expect(invitee2.get(`/user`))
.to.eventually.have.deep.property('invitations.party')
.and.to.be.empty,
]);
});
}); });
}); });
}); });

View File

@@ -1,12 +1,9 @@
import { import {
createAndPopulateGroup, createAndPopulateGroup,
generateGroup,
generateUser,
translate as t, translate as t,
} from '../../../helpers/api-integration.helper'; } from '../../../helpers/api-integration.helper';
describe('POST /groups/:id/removeMember', () => { describe('POST /groups/:id/removeMember', () => {
context('user is not member of the group', () => { context('user is not member of the group', () => {
it('returns an error'); it('returns an error');
}); });
@@ -45,7 +42,7 @@ describe('POST /groups/:id/removeMember', () => {
it('can remove other members of guild', async () => { it('can remove other members of guild', async () => {
return leader.post(`/groups/${group._id}/removeMember`, null, { return leader.post(`/groups/${group._id}/removeMember`, null, {
uuid: member._id, uuid: member._id,
}).then((res) => { }).then(() => {
return leader.get(`/groups/${group._id}`); return leader.get(`/groups/${group._id}`);
}).then((guild) => { }).then((guild) => {
expect(guild.members).to.have.a.lengthOf(1); expect(guild.members).to.have.a.lengthOf(1);

View File

@@ -1,6 +1,5 @@
import { import {
createAndPopulateGroup, createAndPopulateGroup,
generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
@@ -17,14 +16,14 @@ describe('DELETE /groups/:id/chat', () => {
group = res.group; group = res.group;
user = res.leader; 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) => { }).then((res) => {
message = res.message; message = res.message;
}); });
}); });
it('deletes a message', async () => { 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/`); return user.get(`/groups/${group._id}/chat/`);
}).then((messages) => { }).then((messages) => {
expect(messages).to.have.length(0); expect(messages).to.have.length(0);

View File

@@ -1,45 +1,38 @@
import { import {
createAndPopulateGroup, createAndPopulateGroup,
generateUser,
translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('GET /groups/:id/chat', () => { describe('GET /groups/:id/chat', () => {
context('group with multiple messages', () => { context('group with multiple messages', () => {
let group, member, message1, message2, user; let group, member, user;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ let groupData = await createAndPopulateGroup({
groupDetails: { groupDetails: {
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
}, },
members: 1, 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 () => { it('gets messages', async () => {
return user.get(`/groups/${group._id}/chat`).then((messages) => { let messages = await user.get(`/groups/${group._id}/chat`);
expect(messages).to.have.length(2);
let message = messages[0]; expect(messages).to.have.length(2);
expect(message.id).to.exist;
expect(message.text).to.exist; let message = messages[0];
expect(message.uuid).to.exist;
}); expect(message.id).to.exist;
expect(message.text).to.exist;
expect(message.uuid).to.exist;
}); });
}); });
}); });

View File

@@ -1,11 +1,9 @@
import { import {
createAndPopulateGroup, createAndPopulateGroup,
generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('POST /groups/:id/chat', () => { describe('POST /groups/:id/chat', () => {
let group, user; let group, user;
beforeEach(async () => { beforeEach(async () => {

View File

@@ -53,7 +53,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
}); });
it('clears flags', async () => { 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`); return admin.get(`/groups/${group._id}/chat`);
}).then((messages) => { }).then((messages) => {
expect(messages[0].flagCount).to.eql(0); 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 () => { 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`); return admin.get(`/groups/${group._id}/chat`);
}).then((messages) => { }).then((messages) => {
expect(messages[0].flags).to.have.property('some-id', true); 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', () => { context('admin user, group with multiple messages', () => {
let admin, author, group, member; let admin, author, groupWithMessages;
beforeEach(async () => { beforeEach(async () => {
author = await generateUser(); author = await generateUser();
@@ -92,21 +92,20 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
privacy: 'public', privacy: 'public',
chat: [ chat: [
{ id: 'message-to-unflag', uuid: author._id, flagCount: 1, flags: {'some-user': true} }, { 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: '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: '2-flag-message', uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } },
{ id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} },
], ],
}, },
members: 1, members: 1,
}); });
group = groupData.group; groupWithMessages = groupData.group;
member = groupData.members[0];
}); });
it('changes only the message that is flagged', async () => { it('changes only the message that is flagged', async () => {
return admin.post(`/groups/${group._id}/chat/message-to-unflag/clearflags`).then((messages) => { return admin.post(`/groups/${groupWithMessages._id}/chat/message-to-unflag/clearflags`).then(() => {
return admin.get(`/groups/${group._id}/chat`); return admin.get(`/groups/${groupWithMessages._id}/chat`);
}).then((messages) => { }).then((messages) => {
expect(messages).to.have.lengthOf(4); expect(messages).to.have.lengthOf(4);

View File

@@ -5,7 +5,6 @@ import {
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('POST /groups/:id/chat/:id/flag', () => { describe('POST /groups/:id/chat/:id/flag', () => {
context('another member\'s message', () => { context('another member\'s message', () => {
let group, member, message, user; let group, member, message, user;
@@ -21,23 +20,22 @@ describe('POST /groups/:id/chat/:id/flag', () => {
user = res.leader; user = res.leader;
member = res.members[0]; 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) => { }).then((res) => {
message = res.message; message = res.message;
}); });
}); });
it('flags message', async () => { 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`); return user.get(`/groups/${group._id}/chat`);
}).then((messages) => { }).then((messages) => {
let message = messages[0]; expect(messages[0].flagCount).to.eql(1);
expect(message.flagCount).to.eql(1);
}); });
}); });
it('cannot flag the same message twice', async () => { 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`); return user.post(`/groups/${group._id}/chat/${message.id}/flag`);
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
@@ -60,7 +58,7 @@ describe('POST /groups/:id/chat/:id/flag', () => {
group = res.group; group = res.group;
user = res.leader; 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) => { }).then((res) => {
message = res.message; message = res.message;
}); });
@@ -76,7 +74,7 @@ describe('POST /groups/:id/chat/:id/flag', () => {
}); });
context('nonexistant message', () => { context('nonexistant message', () => {
let group, message, user; let group, user;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ return createAndPopulateGroup({
@@ -100,7 +98,7 @@ describe('POST /groups/:id/chat/:id/flag', () => {
}); });
context('group with multiple messages', () => { context('group with multiple messages', () => {
let admin, author, group, member, message, user; let admin, author, group, user;
beforeEach(async () => { beforeEach(async () => {
author = await generateUser(); author = await generateUser();
@@ -114,8 +112,8 @@ describe('POST /groups/:id/chat/:id/flag', () => {
privacy: 'public', privacy: 'public',
chat: [ chat: [
{ id: 'message-to-be-flagged', uuid: author._id, flagCount: 0, flags: {} }, { id: 'message-to-be-flagged', uuid: author._id, flagCount: 0, flags: {} },
{ id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { 'id1': 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: '2-flag-message', uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } },
{ id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} },
], ],
}, },
@@ -124,11 +122,10 @@ describe('POST /groups/:id/chat/:id/flag', () => {
group = groupData.group; group = groupData.group;
user = groupData.leader; user = groupData.leader;
member = groupData.members[0];
}); });
it('changes only the message that is flagged', async () => { 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`); return admin.get(`/groups/${group._id}/chat`);
}).then((messages) => { }).then((messages) => {
expect(messages).to.have.lengthOf(4); expect(messages).to.have.lengthOf(4);
@@ -172,18 +169,17 @@ describe('POST /groups/:id/chat/:id/flag', () => {
user = res.leader; user = res.leader;
member = res.members[0]; 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) => { }).then((res) => {
message = res.message; message = res.message;
}); });
}); });
it('sets flagCount to 5', async () => { 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`); return user.get(`/groups/${group._id}/chat`);
}).then((messages) => { }).then((messages) => {
let message = messages[0]; expect(messages[0].flagCount).to.eql(5);
expect(message.flagCount).to.eql(5);
}); });
}); });
}); });

View File

@@ -5,7 +5,6 @@ import {
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('POST /groups/:id/chat/:id/like', () => { describe('POST /groups/:id/chat/:id/like', () => {
context('another member\'s message', () => { context('another member\'s message', () => {
let group, member, message, user; let group, member, message, user;
@@ -21,7 +20,7 @@ describe('POST /groups/:id/chat/:id/like', () => {
user = res.leader; user = res.leader;
member = res.members[0]; 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) => { }).then((res) => {
message = res.message; message = res.message;
}); });
@@ -29,17 +28,15 @@ describe('POST /groups/:id/chat/:id/like', () => {
it('likes message', async () => { it('likes message', async () => {
return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => {
let message = messages[0]; expect(messages[0].likes[user._id]).to.eql(true);
expect(message.likes[user._id]).to.eql(true);
}); });
}); });
it('returns the message object', async () => { it('returns the message object', async () => {
return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => {
let message = messages[0]; expect(messages[0].text).to.eql('Group member message');
expect(message.text).to.eql('Group member message'); expect(messages[0].uuid).to.eql(member._id);
expect(message.uuid).to.eql(member._id); expect(messages[0].user).to.eql(member.profile.name);
expect(message.user).to.eql(member.profile.name);
}); });
}); });
}); });
@@ -58,7 +55,7 @@ describe('POST /groups/:id/chat/:id/like', () => {
group = res.group; group = res.group;
user = res.leader; 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) => { }).then((res) => {
message = res.message; message = res.message;
}); });
@@ -74,7 +71,7 @@ describe('POST /groups/:id/chat/:id/like', () => {
}); });
context('group with multiple messages', () => { context('group with multiple messages', () => {
let admin, author, group, member, message, user; let admin, author, group, user;
beforeEach(async () => { beforeEach(async () => {
author = await generateUser(); author = await generateUser();
@@ -88,8 +85,8 @@ describe('POST /groups/:id/chat/:id/like', () => {
privacy: 'public', privacy: 'public',
chat: [ chat: [
{ id: 'message-to-be-liked', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, { 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: '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: '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: {} }, { id: 'no-likes', likes: {}, uuid: author._id, flagCount: 0, flags: {} },
], ],
}, },
@@ -98,11 +95,10 @@ describe('POST /groups/:id/chat/:id/like', () => {
group = groupData.group; group = groupData.group;
user = groupData.leader; user = groupData.leader;
member = groupData.members[0];
}); });
it('changes only the message that is liked', async () => { 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`); return admin.get(`/groups/${group._id}/chat`);
}).then((messages) => { }).then((messages) => {
expect(messages).to.have.lengthOf(4); expect(messages).to.have.lengthOf(4);
@@ -128,7 +124,7 @@ describe('POST /groups/:id/chat/:id/like', () => {
}); });
context('nonexistant message', () => { context('nonexistant message', () => {
let group, message, user; let group, user;
beforeEach(async () => { beforeEach(async () => {
return createAndPopulateGroup({ return createAndPopulateGroup({

View File

@@ -7,7 +7,6 @@ import { v4 as generateRandomUserName } from 'uuid';
import { each } from 'lodash'; import { each } from 'lodash';
describe('POST /register', () => { describe('POST /register', () => {
context('username and email are free', () => { context('username and email are free', () => {
it('registers a new user', async () => { it('registers a new user', async () => {
let api = requester(); let api = requester();
@@ -16,9 +15,9 @@ describe('POST /register', () => {
let password = 'password'; let password = 'password';
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user._id).to.exist; expect(user._id).to.exist;
@@ -35,10 +34,10 @@ describe('POST /register', () => {
let confirmPassword = 'not password'; let confirmPassword = 'not password';
return expect(api.post('/register', { return expect(api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: confirmPassword, confirmPassword,
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
text: t('messageAuthPasswordMustMatch'), text: t('messageAuthPasswordMustMatch'),
@@ -52,9 +51,9 @@ describe('POST /register', () => {
let confirmPassword = 'password'; let confirmPassword = 'password';
return expect(api.post('/register', { return expect(api.post('/register', {
email: email, email,
password: password, password,
confirmPassword: confirmPassword, confirmPassword,
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
text: t('messageAuthCredentialsRequired'), text: t('messageAuthCredentialsRequired'),
@@ -68,9 +67,9 @@ describe('POST /register', () => {
let confirmPassword = 'password'; let confirmPassword = 'password';
return expect(api.post('/register', { return expect(api.post('/register', {
username: username, username,
password: password, password,
confirmPassword: confirmPassword, confirmPassword,
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
text: t('messageAuthCredentialsRequired'), text: t('messageAuthCredentialsRequired'),
@@ -84,9 +83,9 @@ describe('POST /register', () => {
let confirmPassword = 'password'; let confirmPassword = 'password';
return expect(api.post('/register', { return expect(api.post('/register', {
username: username, username,
email: email, email,
confirmPassword: confirmPassword, confirmPassword,
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
text: t('messageAuthCredentialsRequired'), text: t('messageAuthCredentialsRequired'),
@@ -102,7 +101,7 @@ describe('POST /register', () => {
return generateUser({ return generateUser({
'auth.local.username': username, 'auth.local.username': username,
'auth.local.lowerCaseUsername': username, 'auth.local.lowerCaseUsername': username,
'auth.local.email': email 'auth.local.email': email,
}); });
}); });
@@ -112,9 +111,9 @@ describe('POST /register', () => {
let password = 'password'; let password = 'password';
return expect(api.post('/register', { return expect(api.post('/register', {
username: username, username,
email: uniqueEmail, email: uniqueEmail,
password: password, password,
confirmPassword: password, confirmPassword: password,
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
@@ -128,9 +127,9 @@ describe('POST /register', () => {
let password = 'password'; let password = 'password';
return expect(api.post('/register', { return expect(api.post('/register', {
username: uniqueUsername, username: uniqueUsername,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
})).to.eventually.be.rejected.and.eql({ })).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
@@ -151,14 +150,14 @@ describe('POST /register', () => {
it('sets all site tour values to -2 (already seen)', async () => { it('sets all site tour values to -2 (already seen)', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.flags.tour).to.not.be.empty; expect(user.flags.tour).to.not.be.empty;
each(user.flags.tour, (value, attribute) => { each(user.flags.tour, (value) => {
expect(value).to.eql(-2); expect(value).to.eql(-2);
}); });
}); });
@@ -166,9 +165,9 @@ describe('POST /register', () => {
it('populates user with default todos, not no other task types', async () => { it('populates user with default todos, not no other task types', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.todos).to.not.be.empty; expect(user.todos).to.not.be.empty;
@@ -180,9 +179,9 @@ describe('POST /register', () => {
it('populates user with default tags', async () => { it('populates user with default tags', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.tags).to.not.be.empty; expect(user.tags).to.not.be.empty;
@@ -202,14 +201,14 @@ describe('POST /register', () => {
it('sets all common tutorial flags to true', async () => { it('sets all common tutorial flags to true', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.flags.tour).to.not.be.empty; 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); expect(value).to.eql(true);
}); });
}); });
@@ -217,9 +216,9 @@ describe('POST /register', () => {
it('populates user with default todos, habits, and rewards', async () => { it('populates user with default todos, habits, and rewards', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.todos).to.not.be.empty; expect(user.todos).to.not.be.empty;
@@ -231,9 +230,9 @@ describe('POST /register', () => {
it('populates user with default tags', async () => { it('populates user with default tags', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.tags).to.not.be.empty; expect(user.tags).to.not.be.empty;
@@ -253,14 +252,14 @@ describe('POST /register', () => {
it('sets all common tutorial flags to true', async () => { it('sets all common tutorial flags to true', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.flags.tour).to.not.be.empty; 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); expect(value).to.eql(true);
}); });
}); });
@@ -268,9 +267,9 @@ describe('POST /register', () => {
it('populates user with default todos, habits, and rewards', async () => { it('populates user with default todos, habits, and rewards', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.todos).to.not.be.empty; expect(user.todos).to.not.be.empty;
@@ -282,9 +281,9 @@ describe('POST /register', () => {
it('populates user with default tags', async () => { it('populates user with default tags', async () => {
return api.post('/register', { return api.post('/register', {
username: username, username,
email: email, email,
password: password, password,
confirmPassword: password, confirmPassword: password,
}).then((user) => { }).then((user) => {
expect(user.tags).to.not.be.empty; expect(user.tags).to.not.be.empty;

View File

@@ -3,7 +3,6 @@ import {
createAndPopulateGroup, createAndPopulateGroup,
generateGroup, generateGroup,
generateUser, generateUser,
translate as t,
} from '../../../helpers/api-integration.helper'; } from '../../../helpers/api-integration.helper';
import { find } from 'lodash'; import { find } from 'lodash';
@@ -15,7 +14,7 @@ describe('DELETE /user', () => {
}); });
it('deletes the user', async () => { it('deletes the user', async () => {
return expect(user.del('/user').then((fetchedUser) => { return expect(user.del('/user').then(() => {
return checkExistence('users', user._id); return checkExistence('users', user._id);
})).to.eventually.eql(false); })).to.eventually.eql(false);
}); });
@@ -30,16 +29,16 @@ describe('DELETE /user', () => {
beforeEach(async () => { beforeEach(async () => {
return generateGroup(user, { return generateGroup(user, {
type: 'party', type: 'party',
privacy: 'private' privacy: 'private',
}).then((group) => { }).then((group) => {
party = group; party = group;
}); });
}); });
it('deletes party when user is the only member', async () => { it('deletes party when user is the only member', async () => {
return expect(user.del('/user').then((result) => { return expect(user.del('/user').then(() => {
return checkExistence('groups', party._id); return checkExistence('groups', party._id);
})).to.eventually.eql(false); })).to.eventually.eql(false);
}); });
}); });
@@ -49,16 +48,16 @@ describe('DELETE /user', () => {
beforeEach(async () => { beforeEach(async () => {
return generateGroup(user, { return generateGroup(user, {
type: 'guild', type: 'guild',
privacy: 'private' privacy: 'private',
}).then((group) => { }).then((group) => {
guild = group; guild = group;
}); });
}); });
it('deletes guild when user is the only member', async () => { it('deletes guild when user is the only member', async () => {
return expect(user.del('/user').then((result) => { return expect(user.del('/user').then(() => {
return checkExistence('groups', guild._id); return checkExistence('groups', guild._id);
})).to.eventually.eql(false); })).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 () => { 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}`); return newLeader.get(`/groups/${group._id}`);
}).then((guild) => { }).then((guild) => {
expect(guild.leader).to.exist; expect(guild.leader).to.exist;
@@ -95,8 +94,8 @@ describe('DELETE /user', () => {
beforeEach(async () => { beforeEach(async () => {
return generateUser({ return generateUser({
balance: 10, balance: 10,
}).then((user) => { }).then((_user) => {
userToDelete = user; userToDelete = _user;
return generateGroup(userToDelete, { return generateGroup(userToDelete, {
type: 'guild', type: 'guild',
@@ -121,7 +120,7 @@ describe('DELETE /user', () => {
}); });
it('removes user from all groups user was a part of', async () => { 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}`); return otherUser.get(`/groups/${group1._id}`);
}).then((fetchedGroup1) => { }).then((fetchedGroup1) => {
expect(fetchedGroup1.members).to.be.empty; expect(fetchedGroup1.members).to.be.empty;
@@ -137,7 +136,6 @@ describe('DELETE /user', () => {
expect(userInGroup).to.not.be.ok; expect(userInGroup).to.not.be.ok;
}); });
}); });
}); });
context('pending invitation to group', () => { context('pending invitation to group', () => {
@@ -159,7 +157,7 @@ describe('DELETE /user', () => {
}); });
it('removes invitations from groups', async () => { it('removes invitations from groups', async () => {
return userToDelete.del('/user').then((res) => { return userToDelete.del('/user').then(() => {
return otherUser.get(`/groups/${group._id}`); return otherUser.get(`/groups/${group._id}`);
}).then((fetchedGroup) => { }).then((fetchedGroup) => {
expect(fetchedGroup.invites).to.have.a.lengthOf(1); expect(fetchedGroup.invites).to.have.a.lengthOf(1);

View File

@@ -11,7 +11,7 @@ describe('GET /user/tags/id', () => {
}); });
it('gets a user\'s tag by id', async () => { 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]); .to.eventually.eql(user.tags[0]);
}); });

View File

@@ -15,7 +15,7 @@ describe('PUT /user', () => {
context('allowed operations', () => { context('allowed operations', () => {
it('updates the user', async () => { it('updates the user', async () => {
let updatedUser = await user.put('/user', { let updatedUser = await user.put('/user', {
'profile.name' : 'Frodo', 'profile.name': 'Frodo',
'preferences.costume': true, 'preferences.costume': true,
'stats.hp': 14, 'stats.hp': 14,
}); });
@@ -29,19 +29,19 @@ describe('PUT /user', () => {
context('top level protected operations', () => { context('top level protected operations', () => {
let protectedOperations = { let protectedOperations = {
'gem balance': {balance: 100}, 'gem balance': {balance: 100},
'auth': {'auth.blocked': true, 'auth.timestamps.created': new Date()}, auth: {'auth.blocked': true, 'auth.timestamps.created': new Date()},
'contributor': {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'}, contributor: {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'},
'backer': {'backer.tier': 10, 'backer.npc': 'Bilbo'}, backer: {'backer.tier': 10, 'backer.npc': 'Bilbo'},
'subscriptions': {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000}, subscriptions: {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000},
'customization gem purchases': {'purchased.background.tavern': true, 'purchased.skin.bear': true}, '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) => { each(protectedOperations, (data, testName) => {
it(`does not allow updating ${testName}`, async () => { it(`does not allow updating ${testName}`, async () => {
let errorText = []; let errorText = [];
each(data, (value, operation) => { 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({ 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 () => { it(`does not allow updating ${testName}`, async () => {
let errorText = []; let errorText = [];
each(data, (value, operation) => { 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({ await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({

View File

@@ -4,80 +4,77 @@ import {
import { each } from 'lodash'; import { each } from 'lodash';
describe('GET /user/anonymized', () => { describe('GET /user/anonymized', () => {
let user; let user, anonymizedUser;
before(async () => { before(async () => {
return generateUser({ user = await generateUser({
'inbox.messages' : { 'inbox.messages': {
'the-message-id' : { 'the-message-id': {
sort : 214, sort: 214,
user : 'Some user', user: 'Some user',
backer : {}, backer: {},
contributor : { contributor: {
text : 'Blacksmith', text: 'Blacksmith',
level : 2, level: 2,
contributions : 'Made some contributions', contributions: 'Made some contributions',
admin : false admin: false,
}, },
uuid : 'some-users-uuid', uuid: 'some-users-uuid',
flagCount : 0, flagCount: 0,
flags : {}, flags: {},
likes : {}, likes: {},
timestamp : 1444154258699.0000000000000000, timestamp: 1444154258699.0000000000000000,
text : 'Lorem ipsum', text: 'Lorem ipsum',
id : 'the-messages-id', id: 'the-messages-id',
sent : true 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;
}); });
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 () => { it('retains user id', async () => {
expect(user._id).to.exist; expect(anonymizedUser._id).to.eql(user._id);
}); });
it('removes credentials and financial information', async () => { it('removes credentials and financial information', async () => {
expect(user.apiToken).to.not.exist; expect(anonymizedUser.apiToken).to.not.exist;
expect(user.auth.local).to.not.exist; expect(anonymizedUser.auth.local).to.not.exist;
expect(user.auth.facebook).to.not.exist; expect(anonymizedUser.auth.facebook).to.not.exist;
expect(user.purchased.plan).to.not.exist; expect(anonymizedUser.purchased.plan).to.not.exist;
}); });
it('removes profile information', async () => { it('removes profile information', async () => {
expect(user.profile).to.not.exist; expect(anonymizedUser.profile).to.not.exist;
expect(user.contributor).to.not.exist; expect(anonymizedUser.contributor).to.not.exist;
expect(user.achievements.challenges).to.not.exist; expect(anonymizedUser.achievements.challenges).to.not.exist;
}); });
it('removes social information', async () => { it('removes social information', async () => {
expect(user.newMessages).to.not.exist; expect(anonymizedUser.newMessages).to.not.exist;
expect(user.invitations).to.not.exist; expect(anonymizedUser.invitations).to.not.exist;
expect(user.items.special.nyeReceived).to.not.exist; expect(anonymizedUser.items.special.nyeReceived).to.not.exist;
expect(user.items.special.valentineReceived).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'); expect(msg.text).to.eql('inbox message text');
}); });
}); });
it('anonymizes task info', async () => { it('anonymizes task info', async () => {
each(['habits', 'todos', 'dailys', 'rewards'], (tasks) => { each(['habits', 'todos', 'dailys', 'rewards'], (tasks) => {
each(user[tasks], (task) => { each(anonymizedUser[tasks], (task) => {
expect(task.text).to.eql('task text'); expect(task.text).to.eql('task text');
expect(task.notes).to.eql('task notes'); expect(task.notes).to.eql('task notes');
@@ -89,13 +86,13 @@ describe('GET /user/anonymized', () => {
}); });
it('anonymizes tags', async () => { it('anonymizes tags', async () => {
each(user.tags, (tag) => { each(anonymizedUser.tags, (tag) => {
expect(tag.name).to.eql('tag'); expect(tag.name).to.eql('tag');
expect(tag.challenge).to.eql('challenge'); expect(tag.challenge).to.eql('challenge');
}); });
}); });
it('removes webhooks', async () => { it('removes webhooks', async () => {
expect(user.webhooks).to.not.exist; expect(anonymizedUser.webhooks).to.not.exist;
}); });
}); });

View File

@@ -14,24 +14,20 @@ describe('POST /user/batch-update', () => {
context('allowed operations', () => { context('allowed operations', () => {
it('makes batch operations', async () => { it('makes batch operations', async () => {
let task; let task = (await user.get('/user/tasks'))[0];
return user.get('/user/tasks').then((tasks) => { let updatedUser = await user.post('/user/batch-update', [
task = tasks[0]; {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', [ expect(updatedUser.stats.hp).to.eql(30);
{op: 'update', body: {'stats.hp': 30}}, expect(updatedUser.profile.name).to.eql('Samwise');
{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');
return user.get(`/user/tasks/${task.id}`); let fetchedTask = await user.get(`/user/tasks/${task.id}`);
}).then((task) => {
expect(task.value).to.be.greaterThan(0); expect(fetchedTask.value).to.be.greaterThan(task.value);
});
}); });
}); });
@@ -42,7 +38,6 @@ describe('POST /user/batch-update', () => {
}; };
each(protectedOperations, (operation, description) => { each(protectedOperations, (operation, description) => {
it(`it sends back a 500 error for ${description} operation`, async () => { it(`it sends back a 500 error for ${description} operation`, async () => {
return expect(user.post('/user/batch-update', [ return expect(user.post('/user/batch-update', [
{ op: operation }, { op: operation },

View File

@@ -12,13 +12,12 @@ describe('DELETE /user/tasks/:id', () => {
}); });
it('deletes a task', async () => { it('deletes a task', async () => {
return expect(user.del(`/user/tasks/${task.id}`) await user.del(`/user/tasks/${task.id}`);
.then((res) => {
return user.get(`/user/tasks/${task.id}`); await expect(user.get(`/user/tasks/${task.id}`)).to.eventually.be.rejected.and.eql({
})).to.eventually.be.rejected.and.eql({ code: 404,
code: 404, text: t('messageTaskNotFound'),
text: t('messageTaskNotFound'), });
});
}); });
it('returns an error if the task does not exist', async () => { it('returns an error if the task does not exist', async () => {

View File

@@ -1,6 +1,5 @@
import { import {
generateUser, generateUser,
translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('GET /user/tasks/', () => { describe('GET /user/tasks/', () => {

View File

@@ -4,7 +4,6 @@ import {
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('POST /user/tasks', () => { describe('POST /user/tasks', () => {
let user; let user;
beforeEach(async () => { beforeEach(async () => {

View File

@@ -1,6 +1,5 @@
import { import {
generateUser, generateUser,
translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-integration.helper';
describe('PUT /user/tasks/:id', () => { describe('PUT /user/tasks/:id', () => {
@@ -34,13 +33,13 @@ describe('PUT /user/tasks/:id', () => {
text: 'new text', text: 'new text',
notes: 'new notes', notes: 'new notes',
value: 10000, value: 10000,
priority: .5, priority: 0.5,
attribute: 'str', attribute: 'str',
}).then((updatedTask) => { }).then((updatedTask) => {
expect(updatedTask.text).to.eql('new text'); expect(updatedTask.text).to.eql('new text');
expect(updatedTask.notes).to.eql('new notes'); expect(updatedTask.notes).to.eql('new notes');
expect(updatedTask.value).to.eql(10000); 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'); expect(updatedTask.attribute).to.eql('str');
}); });
}); });