Merge branch 'develop' into api-v3

test/api/v2/user/PUT-user.test.js

@@ -175,4 +175,27 @@ describe('PUT /user', () => {
       });
     });
   });
+
+  context('Improvement Categories', () => {
+    it('sets valid categories', async () => {
+      await user.put('/user', {
+        'preferences.improvementCategories': ['work', 'school'],
+      });
+
+      await user.sync();
+
+      expect(user.preferences.improvementCategories).to.eql(['work', 'school']);
+    });
+
+    it('discards invalid categories', async () => {
+      await expect(user.put('/user', {
+        'preferences.improvementCategories': ['work', 'procrastination', 'school'],
+      })).to.eventually.be.rejected.and.eql({
+        code: 400,
+        text: [
+          'Validator failed for path `preferences.improvementCategories` with value `work,procrastination,school`',
+        ],
+      });
+    });
+  });
 });

test/api/v3/integration/tasks/POST-tasks_user.test.js

@@ -2,6 +2,7 @@ import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-v3-integration.helper';
+import { v4 as generateUUID } from 'uuid';
 
 describe('POST /tasks/user', () => {
   let user;
@@ -143,6 +144,27 @@ describe('POST /tasks/user', () => {
     });
   });
 
+  context('all types', () => {
+    it('can create reminders', async () => {
+      let id1 = generateUUID();
+
+      let task = await user.post('/tasks/user', {
+        text: 'test habit',
+        type: 'habit',
+        reminders: [
+          {id: id1, startDate: new Date(), time: new Date()},
+        ],
+      });
+
+      expect(task.reminders).to.be.an('array');
+      expect(task.reminders.length).to.eql(1);
+      expect(task.reminders[0]).to.be.an('object');
+      expect(task.reminders[0].id).to.eql(id1);
+      expect(task.reminders[0].startDate).to.be.a('string'); // json doesn't have dates
+      expect(task.reminders[0].time).to.be.a('string');
+    });
+  });
+
   context('habits', () => {
     it('creates a habit', async () => {
       let task = await user.post('/tasks/user', {

test/api/v3/integration/tasks/PUT-tasks_id.test.js

@@ -57,6 +57,40 @@ describe('PUT /tasks/:id', () => {
     });
   });
 
+  context('all types', () => {
+    let daily;
+
+    beforeEach(async () => {
+      daily = await user.post('/tasks/user', {
+        text: 'test daily',
+        type: 'daily',
+        notes: 1976,
+      });
+    });
+
+    it('can update reminders (replace them)', async () => {
+      await user.put(`/tasks/${daily._id}`, {
+        reminders: [
+          {time: new Date(), startDate: new Date()},
+        ],
+      });
+
+      let id1 = generateUUID();
+      let id2 = generateUUID();
+
+      let savedDaily = await user.put(`/tasks/${daily._id}`, {
+        checklist: [
+          {id: id1, time: new Date(), startDate: new Date()},
+          {id: id2, time: new Date(), startDate: new Date()},
+        ],
+      });
+
+      expect(savedDaily.reminders.length).to.equal(2);
+      expect(savedDaily.reminders[0].id).to.equal(id1);
+      expect(savedDaily.reminders[1].id).to.equal(id2);
+    });
+  });
+
   context('habits', () => {
     let habit;