From 7490bfae87c27fef1c57dc4a49b30c3743fbeeb3 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sat, 2 Jan 2016 16:04:39 +0100 Subject: [PATCH] update POST-tasks test to async/await syntax --- .../v3/integration/tasks/POST-tasks.test.js | 362 +++++++++--------- 1 file changed, 181 insertions(+), 181 deletions(-) diff --git a/test/api/v3/integration/tasks/POST-tasks.test.js b/test/api/v3/integration/tasks/POST-tasks.test.js index f4a7fed227..c8b9e9a37a 100644 --- a/test/api/v3/integration/tasks/POST-tasks.test.js +++ b/test/api/v3/integration/tasks/POST-tasks.test.js @@ -6,14 +6,14 @@ import { describe('POST /tasks', () => { let user; - before(() => { + before(async () => { return generateUser().then((generatedUser) => { user = generatedUser; }); }); context('validates params', () => { - it('returns an error if req.body.type is absent', () => { + it('returns an error if req.body.type is absent', async () => { return expect(user.post('/tasks', { notType: 'habit', })).to.eventually.be.rejected.and.eql({ @@ -23,7 +23,7 @@ describe('POST /tasks', () => { }); }); - it('returns an error if req.body.type is not valid', () => { + it('returns an error if req.body.type is not valid', async () => { return expect(user.post('/tasks', { type: 'habitF', })).to.eventually.be.rejected.and.eql({ @@ -33,7 +33,7 @@ describe('POST /tasks', () => { }); }); - it('returns an error if one object inside an array is invalid', () => { + it('returns an error if one object inside an array is invalid', async () => { return expect(user.post('/tasks', [ {type: 'habitF'}, {type: 'habit'}, @@ -44,7 +44,7 @@ describe('POST /tasks', () => { }); }); - it('returns an error if req.body.text is absent', () => { + it('returns an error if req.body.text is absent', async () => { return expect(user.post('/tasks', { type: 'habit', })).to.eventually.be.rejected.and.eql({ @@ -54,19 +54,19 @@ describe('POST /tasks', () => { }); }); - it('automatically sets "task.userId" to user\'s uuid', () => { - return user.post('/tasks', { + it('automatically sets "task.userId" to user\'s uuid', async () => { + let task = await user.post('/tasks', { text: 'test habit', type: 'habit', - }).then((task) => { - expect(task.userId).to.equal(user._id); }); + + expect(task.userId).to.equal(user._id); }); it(`ignores setting userId, history, createdAt, updatedAt, challenge, completed, streak, - dateCompleted fields`, () => { - return user.post('/tasks', { + dateCompleted fields`, async () => { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', userId: 123, @@ -77,49 +77,49 @@ describe('POST /tasks', () => { completed: true, streak: 25, dateCompleted: 'never', - }).then((task) => { - expect(task.userId).to.equal(user._id); - expect(task.history).to.eql([]); - expect(task.createdAt).not.to.equal('yesterday'); - expect(task.updatedAt).not.to.equal('tomorrow'); - expect(task.challenge).not.to.equal('no'); - expect(task.completed).to.equal(false); - expect(task.streak).to.equal(0); - expect(task.streak).not.to.equal('never'); }); + + expect(task.userId).to.equal(user._id); + expect(task.history).to.eql([]); + expect(task.createdAt).not.to.equal('yesterday'); + expect(task.updatedAt).not.to.equal('tomorrow'); + expect(task.challenge).not.to.equal('no'); + expect(task.completed).to.equal(false); + expect(task.streak).to.equal(0); + expect(task.streak).not.to.equal('never'); }); - it('ignores invalid fields', () => { - return user.post('/tasks', { + it('ignores invalid fields', async () => { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', notValid: true, - }).then((task) => { - expect(task).not.to.have.property('notValid'); }); + + expect(task).not.to.have.property('notValid'); }); }); context('habits', () => { - it('creates a habit', () => { - return user.post('/tasks', { + it('creates a habit', async () => { + let task = await user.post('/tasks', { text: 'test habit', type: 'habit', up: false, down: true, notes: 1976, - }).then((task) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test habit'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('habit'); - expect(task.up).to.eql(false); - expect(task.down).to.eql(true); }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test habit'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('habit'); + expect(task.up).to.eql(false); + expect(task.down).to.eql(true); }); - it('creates multiple habits', () => { - return user.post('/tasks', [{ + it('creates multiple habits', async () => { + let [task, task2] = await user.post('/tasks', [{ text: 'test habit', type: 'habit', up: false, @@ -131,63 +131,63 @@ describe('POST /tasks', () => { up: true, down: false, notes: 1977, - }]).then(([task, task2]) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test habit'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('habit'); - expect(task.up).to.eql(false); - expect(task.down).to.eql(true); + }]); - expect(task2.userId).to.equal(user._id); - expect(task2.text).to.eql('test habit 2'); - expect(task2.notes).to.eql('1977'); - expect(task2.type).to.eql('habit'); - expect(task2.up).to.eql(true); - expect(task2.down).to.eql(false); - }); + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test habit'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('habit'); + expect(task.up).to.eql(false); + expect(task.down).to.eql(true); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test habit 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('habit'); + expect(task2.up).to.eql(true); + expect(task2.down).to.eql(false); }); - it('defaults to setting up and down to true', () => { - return user.post('/tasks', { + it('defaults to setting up and down to true', async () => { + let task = await user.post('/tasks', { text: 'test habit', type: 'habit', notes: 1976, - }).then((task) => { - expect(task.up).to.eql(true); - expect(task.down).to.eql(true); }); + + expect(task.up).to.eql(true); + expect(task.down).to.eql(true); }); - it('cannot create checklists', () => { - return user.post('/tasks', { + it('cannot create checklists', async () => { + let task = await user.post('/tasks', { text: 'test habit', type: 'habit', checklist: [ {_id: 123, completed: false, text: 'checklist'}, ], - }).then((task) => { - expect(task).not.to.have.property('checklist'); }); + + expect(task).not.to.have.property('checklist'); }); }); context('todos', () => { - it('creates a todo', () => { - return user.post('/tasks', { + it('creates a todo', async () => { + let task = await user.post('/tasks', { text: 'test todo', type: 'todo', notes: 1976, - }).then((task) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test todo'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('todo'); }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test todo'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('todo'); }); - it('creates multiple todos', () => { - return user.post('/tasks', [{ + it('creates multiple todos', async () => { + let [task, task2] = await user.post('/tasks', [{ text: 'test todo', type: 'todo', notes: 1976, @@ -195,61 +195,61 @@ describe('POST /tasks', () => { text: 'test todo 2', type: 'todo', notes: 1977, - }]).then(([task, task2]) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test todo'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('todo'); + }]); - expect(task2.userId).to.equal(user._id); - expect(task2.text).to.eql('test todo 2'); - expect(task2.notes).to.eql('1977'); - expect(task2.type).to.eql('todo'); - }); + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test todo'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('todo'); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test todo 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('todo'); }); - it('can create checklists', () => { - return user.post('/tasks', { + it('can create checklists', async () => { + let task = await user.post('/tasks', { text: 'test todo', type: 'todo', checklist: [ {completed: false, text: 'checklist'}, ], - }).then((task) => { - expect(task.checklist).to.be.an('array'); - expect(task.checklist.length).to.eql(1); - expect(task.checklist[0]).to.be.an('object'); - expect(task.checklist[0].text).to.eql('checklist'); - expect(task.checklist[0].completed).to.eql(false); - expect(task.checklist[0]._id).to.be.a('string'); }); + + expect(task.checklist).to.be.an('array'); + expect(task.checklist.length).to.eql(1); + expect(task.checklist[0]).to.be.an('object'); + expect(task.checklist[0].text).to.eql('checklist'); + expect(task.checklist[0].completed).to.eql(false); + expect(task.checklist[0]._id).to.be.a('string'); }); }); context('dailys', () => { - it('creates a daily', () => { + it('creates a daily', async () => { let now = new Date(); - return user.post('/tasks', { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', notes: 1976, frequency: 'daily', everyX: 5, startDate: now, - }).then((task) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test daily'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('daily'); - expect(task.frequency).to.eql('daily'); - expect(task.everyX).to.eql(5); - expect(new Date(task.startDate)).to.eql(now); }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test daily'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('daily'); + expect(task.frequency).to.eql('daily'); + expect(task.everyX).to.eql(5); + expect(new Date(task.startDate)).to.eql(now); }); - it('creates multiple dailys', () => { - return user.post('/tasks', [{ + it('creates multiple dailys', async () => { + let [task, task2] = await user.post('/tasks', [{ text: 'test daily', type: 'daily', notes: 1976, @@ -257,40 +257,40 @@ describe('POST /tasks', () => { text: 'test daily 2', type: 'daily', notes: 1977, - }]).then(([task, task2]) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test daily'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('daily'); + }]); - expect(task2.userId).to.equal(user._id); - expect(task2.text).to.eql('test daily 2'); - expect(task2.notes).to.eql('1977'); - expect(task2.type).to.eql('daily'); - }); + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test daily'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('daily'); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test daily 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('daily'); }); - it('defaults to a weekly frequency, with every day set', () => { - return user.post('/tasks', { + it('defaults to a weekly frequency, with every day set', async () => { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', - }).then((task) => { - expect(task.frequency).to.eql('weekly'); - expect(task.everyX).to.eql(1); - expect(task.repeat).to.eql({ - m: true, - t: true, - w: true, - th: true, - f: true, - s: true, - su: true, - }); + }); + + expect(task.frequency).to.eql('weekly'); + expect(task.everyX).to.eql(1); + expect(task.repeat).to.eql({ + m: true, + t: true, + w: true, + th: true, + f: true, + s: true, + su: true, }); }); - it('allows repeat field to be configured', () => { - return user.post('/tasks', { + it('allows repeat field to be configured', async () => { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', repeat: { @@ -298,66 +298,66 @@ describe('POST /tasks', () => { w: false, su: false, }, - }).then((task) => { - expect(task.repeat).to.eql({ - m: false, - t: true, - w: false, - th: true, - f: true, - s: true, - su: false, - }); + }); + + expect(task.repeat).to.eql({ + m: false, + t: true, + w: false, + th: true, + f: true, + s: true, + su: false, }); }); - it('defaults startDate to today', () => { + it('defaults startDate to today', async () => { let today = (new Date()).getDay(); - return user.post('/tasks', { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', - }).then((task) => { - expect((new Date(task.startDate)).getDay()).to.eql(today); }); + + expect((new Date(task.startDate)).getDay()).to.eql(today); }); - it('can create checklists', () => { - return user.post('/tasks', { + it('can create checklists', async () => { + let task = await user.post('/tasks', { text: 'test daily', type: 'daily', checklist: [ {completed: false, text: 'checklist'}, ], - }).then((task) => { - expect(task.checklist).to.be.an('array'); - expect(task.checklist.length).to.eql(1); - expect(task.checklist[0]).to.be.an('object'); - expect(task.checklist[0].text).to.eql('checklist'); - expect(task.checklist[0].completed).to.eql(false); - expect(task.checklist[0]._id).to.be.a('string'); }); + + expect(task.checklist).to.be.an('array'); + expect(task.checklist.length).to.eql(1); + expect(task.checklist[0]).to.be.an('object'); + expect(task.checklist[0].text).to.eql('checklist'); + expect(task.checklist[0].completed).to.eql(false); + expect(task.checklist[0]._id).to.be.a('string'); }); }); context('rewards', () => { - it('creates a reward', () => { - return user.post('/tasks', { + it('creates a reward', async () => { + let task = await user.post('/tasks', { text: 'test reward', type: 'reward', notes: 1976, value: 10, - }).then((task) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test reward'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('reward'); - expect(task.value).to.eql(10); }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test reward'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('reward'); + expect(task.value).to.eql(10); }); - it('creates multiple rewards', () => { - return user.post('/tasks', [{ + it('creates multiple rewards', async () => { + let [task, task2] = await user.post('/tasks', [{ text: 'test reward', type: 'reward', notes: 1976, @@ -367,50 +367,50 @@ describe('POST /tasks', () => { type: 'reward', notes: 1977, value: 12, - }]).then(([task, task2]) => { - expect(task.userId).to.equal(user._id); - expect(task.text).to.eql('test reward'); - expect(task.notes).to.eql('1976'); - expect(task.type).to.eql('reward'); - expect(task.value).to.eql(11); + }]); - expect(task2.userId).to.equal(user._id); - expect(task2.text).to.eql('test reward 2'); - expect(task2.notes).to.eql('1977'); - expect(task2.type).to.eql('reward'); - expect(task2.value).to.eql(12); - }); + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test reward'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('reward'); + expect(task.value).to.eql(11); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test reward 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('reward'); + expect(task2.value).to.eql(12); }); - it('defaults to a 0 value', () => { - return user.post('/tasks', { + it('defaults to a 0 value', async () => { + let task = await user.post('/tasks', { text: 'test reward', type: 'reward', - }).then((task) => { - expect(task.value).to.eql(0); }); + + expect(task.value).to.eql(0); }); - it('requires value to be coerced into a number', () => { - return user.post('/tasks', { + it('requires value to be coerced into a number', async () => { + let task = await user.post('/tasks', { text: 'test reward', type: 'reward', value: '10', - }).then((task) => { - expect(task.value).to.eql(10); }); + + expect(task.value).to.eql(10); }); - it('cannot create checklists', () => { - return user.post('/tasks', { + it('cannot create checklists', async () => { + let task = await user.post('/tasks', { text: 'test reward', type: 'reward', checklist: [ {_id: 123, completed: false, text: 'checklist'}, ], - }).then((task) => { - expect(task).not.to.have.property('checklist'); }); + + expect(task).not.to.have.property('checklist'); }); }); });