Change helper to reject only error message

This commit is contained in:
Blade Barringer
2015-10-24 22:23:30 -05:00
parent a0547b99ca
commit b763aedd29
8 changed files with 12 additions and 25 deletions

View File

@@ -99,7 +99,6 @@ describe('GET /groups', () => {
expect(tavern._id).to.eql('habitrpg'); expect(tavern._id).to.eql('habitrpg');
done(); done();
}).catch((err) => { }).catch((err) => {
console.log(err);
done(err); done(err);
}); });
}); });

View File

@@ -159,8 +159,7 @@ describe('GET /groups/:id', () => {
let api = requester(nonMember); let api = requester(nonMember);
api.get(`/groups/${createdGroup._id}`) api.get(`/groups/${createdGroup._id}`)
.then((done)).catch((err) => { .then((done)).catch((err) => {
expect(err.code).to.eql(404); expect(err).to.eql('Group not found or you don\'t have access.');
expect(err.text).to.eql('Group not found or you don\'t have access.');
done() done()
}); });
}); });
@@ -191,8 +190,7 @@ describe('GET /groups/:id', () => {
let api = requester(nonMember); let api = requester(nonMember);
api.get(`/groups/${createdGroup._id}`) api.get(`/groups/${createdGroup._id}`)
.then((done)).catch((err) => { .then((done)).catch((err) => {
expect(err.code).to.eql(404); expect(err).to.eql('Group not found or you don\'t have access.');
expect(err.text).to.eql('Group not found or you don\'t have access.');
done() done()
}); });
}); });
@@ -244,8 +242,7 @@ describe('GET /groups/:id', () => {
let api = requester(user); let api = requester(user);
api.get('/groups/group-that-does-not-exist') api.get('/groups/group-that-does-not-exist')
.then((done)).catch((err) => { .then((done)).catch((err) => {
expect(err.code).to.eql(404); expect(err).to.eql('Group not found or you don\'t have access.');
expect(err.text).to.eql('Group not found or you don\'t have access.');
done() done()
}); });
}); });

View File

@@ -111,8 +111,7 @@ describe('POST /groups', () => {
done('Unexpected success'); done('Unexpected success');
}) })
.catch((err) => { .catch((err) => {
expect(err.code).to.eql(400); expect(err).to.eql('Already in a party, try refreshing.');
expect(err.text).to.eql('Already in a party, try refreshing.');
done(); done();
}); });
}) })
@@ -126,8 +125,7 @@ describe('POST /groups', () => {
done('Unexpected success'); done('Unexpected success');
}) })
.catch((err) => { .catch((err) => {
expect(err.code).to.eql(400); expect(err).to.eql('Parties must be private');
expect(err.text).to.eql('Parties must be private');
done(); done();
}); });
}); });
@@ -157,8 +155,7 @@ describe('POST /groups', () => {
}).then((group) => { }).then((group) => {
done('Unexpected success'); done('Unexpected success');
}).catch((err) => { }).catch((err) => {
expect(err.code).to.eql(401); expect(err).to.eql('Not enough gems!');
expect(err.text).to.eql('Not enough gems!');
done(); done();
}); });
}); });

View File

@@ -34,8 +34,7 @@ describe('POST /groups/:id', () => {
api.post(`/groups/${groupUserDoesNotOwn._id}`, { api.post(`/groups/${groupUserDoesNotOwn._id}`, {
name: 'Change' name: 'Change'
}).then(done).catch((err) => { }).then(done).catch((err) => {
expect(err.code).to.eql(401); expect(err).to.eql('Only the group leader can update the group!');
expect(err.text).to.eql('Only the group leader can update the group!');
done(); done();
}); });
}); });

View File

@@ -90,8 +90,7 @@ describe('POST /groups/:id/leave', () => {
api.post(`/groups/${group._id}/leave`).then((result) => { api.post(`/groups/${group._id}/leave`).then((result) => {
return api.get(`/groups/${group._id}`); return api.get(`/groups/${group._id}`);
}).then(done).catch((err) => { }).then(done).catch((err) => {
expect(err.code).to.eql(404); expect(err).to.eql('Group not found or you don\'t have access.');
expect(err.text).to.eql('Group not found or you don\'t have access.');
done(); done();
}); });
}); });

View File

@@ -40,8 +40,7 @@ describe('POST /groups/:id/removeMember', () => {
api.post(`/groups/${group._id}/removeMember`, null, { api.post(`/groups/${group._id}/removeMember`, null, {
uuid: leader._id, uuid: leader._id,
}).then(done).catch((err) => { }).then(done).catch((err) => {
expect(err.code).to.eql(401); expect(err).to.eql('You cannot remove yourself!');
expect(err.text).to.eql('You cannot remove yourself!');
done(); done();
}); });
}); });

View File

@@ -16,13 +16,13 @@ describe('DELETE /user', () => {
it('deletes the user', (done) => { it('deletes the user', (done) => {
api.del('/user') api.del('/user')
.then((fetchedUser) => { .then((fetchedUser) => {
return api.get('/user') return api.get('/user');
}) })
.then((deletedUser) => { .then((deletedUser) => {
done('Unexpected user'); done('Unexpected user');
}) })
.catch((err) => { .catch((err) => {
expect(err.code).to.eql(401); expect(err).to.eql('No user found.');
done(); done();
}); });
}); });

View File

@@ -188,10 +188,7 @@ function _requestMaker(user, method) {
if (err) { if (err) {
if (!err.response) return reject(err); if (!err.response) return reject(err);
let errorString = JSON.parse(err.response.text).err; let errorString = JSON.parse(err.response.text).err;
return reject({ return reject(errorString);
code: err.response.statusCode,
text: errorString,
});
} }
resolve(response.body); resolve(response.body);