From b763aedd2980b68b2cf45b3b80785299306de42a Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 24 Oct 2015 22:23:30 -0500 Subject: [PATCH] Change helper to reject only error message --- test/api/groups/GET-groups.test.js | 1 - test/api/groups/GET-groups_id.test.js | 9 +++------ test/api/groups/POST-groups.test.js | 9 +++------ test/api/groups/POST-groups_id.test.js | 3 +-- test/api/groups/POST-groups_id_leave.test.js | 3 +-- test/api/groups/POST-groups_id_removeMember.test.js | 3 +-- test/api/user/DELETE-user.test.js | 4 ++-- test/helpers/api.helper.js | 5 +---- 8 files changed, 12 insertions(+), 25 deletions(-) diff --git a/test/api/groups/GET-groups.test.js b/test/api/groups/GET-groups.test.js index 102efc41f1..9b74209a67 100644 --- a/test/api/groups/GET-groups.test.js +++ b/test/api/groups/GET-groups.test.js @@ -99,7 +99,6 @@ describe('GET /groups', () => { expect(tavern._id).to.eql('habitrpg'); done(); }).catch((err) => { - console.log(err); done(err); }); }); diff --git a/test/api/groups/GET-groups_id.test.js b/test/api/groups/GET-groups_id.test.js index c23f6de01b..f9ad4c2dc8 100644 --- a/test/api/groups/GET-groups_id.test.js +++ b/test/api/groups/GET-groups_id.test.js @@ -159,8 +159,7 @@ describe('GET /groups/:id', () => { let api = requester(nonMember); api.get(`/groups/${createdGroup._id}`) .then((done)).catch((err) => { - expect(err.code).to.eql(404); - expect(err.text).to.eql('Group not found or you don\'t have access.'); + expect(err).to.eql('Group not found or you don\'t have access.'); done() }); }); @@ -191,8 +190,7 @@ describe('GET /groups/:id', () => { let api = requester(nonMember); api.get(`/groups/${createdGroup._id}`) .then((done)).catch((err) => { - expect(err.code).to.eql(404); - expect(err.text).to.eql('Group not found or you don\'t have access.'); + expect(err).to.eql('Group not found or you don\'t have access.'); done() }); }); @@ -244,8 +242,7 @@ describe('GET /groups/:id', () => { let api = requester(user); api.get('/groups/group-that-does-not-exist') .then((done)).catch((err) => { - expect(err.code).to.eql(404); - expect(err.text).to.eql('Group not found or you don\'t have access.'); + expect(err).to.eql('Group not found or you don\'t have access.'); done() }); }); diff --git a/test/api/groups/POST-groups.test.js b/test/api/groups/POST-groups.test.js index e231e17812..362d875a36 100644 --- a/test/api/groups/POST-groups.test.js +++ b/test/api/groups/POST-groups.test.js @@ -111,8 +111,7 @@ describe('POST /groups', () => { done('Unexpected success'); }) .catch((err) => { - expect(err.code).to.eql(400); - expect(err.text).to.eql('Already in a party, try refreshing.'); + expect(err).to.eql('Already in a party, try refreshing.'); done(); }); }) @@ -126,8 +125,7 @@ describe('POST /groups', () => { done('Unexpected success'); }) .catch((err) => { - expect(err.code).to.eql(400); - expect(err.text).to.eql('Parties must be private'); + expect(err).to.eql('Parties must be private'); done(); }); }); @@ -157,8 +155,7 @@ describe('POST /groups', () => { }).then((group) => { done('Unexpected success'); }).catch((err) => { - expect(err.code).to.eql(401); - expect(err.text).to.eql('Not enough gems!'); + expect(err).to.eql('Not enough gems!'); done(); }); }); diff --git a/test/api/groups/POST-groups_id.test.js b/test/api/groups/POST-groups_id.test.js index 43659bae91..2cd9f05b41 100644 --- a/test/api/groups/POST-groups_id.test.js +++ b/test/api/groups/POST-groups_id.test.js @@ -34,8 +34,7 @@ describe('POST /groups/:id', () => { api.post(`/groups/${groupUserDoesNotOwn._id}`, { name: 'Change' }).then(done).catch((err) => { - expect(err.code).to.eql(401); - expect(err.text).to.eql('Only the group leader can update the group!'); + expect(err).to.eql('Only the group leader can update the group!'); done(); }); }); diff --git a/test/api/groups/POST-groups_id_leave.test.js b/test/api/groups/POST-groups_id_leave.test.js index 6a741206c0..64904763ba 100644 --- a/test/api/groups/POST-groups_id_leave.test.js +++ b/test/api/groups/POST-groups_id_leave.test.js @@ -90,8 +90,7 @@ describe('POST /groups/:id/leave', () => { api.post(`/groups/${group._id}/leave`).then((result) => { return api.get(`/groups/${group._id}`); }).then(done).catch((err) => { - expect(err.code).to.eql(404); - expect(err.text).to.eql('Group not found or you don\'t have access.'); + expect(err).to.eql('Group not found or you don\'t have access.'); done(); }); }); diff --git a/test/api/groups/POST-groups_id_removeMember.test.js b/test/api/groups/POST-groups_id_removeMember.test.js index 283fcff60e..6349979586 100644 --- a/test/api/groups/POST-groups_id_removeMember.test.js +++ b/test/api/groups/POST-groups_id_removeMember.test.js @@ -40,8 +40,7 @@ describe('POST /groups/:id/removeMember', () => { api.post(`/groups/${group._id}/removeMember`, null, { uuid: leader._id, }).then(done).catch((err) => { - expect(err.code).to.eql(401); - expect(err.text).to.eql('You cannot remove yourself!'); + expect(err).to.eql('You cannot remove yourself!'); done(); }); }); diff --git a/test/api/user/DELETE-user.test.js b/test/api/user/DELETE-user.test.js index ed97b2bdb7..927403a73b 100644 --- a/test/api/user/DELETE-user.test.js +++ b/test/api/user/DELETE-user.test.js @@ -16,13 +16,13 @@ describe('DELETE /user', () => { it('deletes the user', (done) => { api.del('/user') .then((fetchedUser) => { - return api.get('/user') + return api.get('/user'); }) .then((deletedUser) => { done('Unexpected user'); }) .catch((err) => { - expect(err.code).to.eql(401); + expect(err).to.eql('No user found.'); done(); }); }); diff --git a/test/helpers/api.helper.js b/test/helpers/api.helper.js index 01afef66f1..e169698e55 100644 --- a/test/helpers/api.helper.js +++ b/test/helpers/api.helper.js @@ -188,10 +188,7 @@ function _requestMaker(user, method) { if (err) { if (!err.response) return reject(err); let errorString = JSON.parse(err.response.text).err; - return reject({ - code: err.response.statusCode, - text: errorString, - }); + return reject(errorString); } resolve(response.body);