Fixed broken tests

test/api/v3/unit/libs/cron.test.js

@@ -371,7 +371,7 @@ describe('cron', () => {
       tasksByType.dailys[0].everyX = 5;
       tasksByType.dailys[0].startDate = moment().add(1, 'days').toDate();
       cron({user, tasksByType, daysMissed, analytics});
-      expect(tasksByType.dailys[0].nextDue.length).to.eql(3);
+      expect(tasksByType.dailys[0].nextDue.length).to.eql(6);
     });
 
     it('should add history', () => {

test/common/shouldDo.test.js

@@ -543,7 +543,19 @@ describe('shouldDo', () => {
       beforeEach(() => {
         options.dayStart = 7;
         dailyTask.everyX = 3;
-        threeWeeksFromToday = moment().add(3, 'weeks').toDate();
+        dailyTask.repeat = {
+          su: false,
+          s: false,
+          f: false,
+          th: false,
+          w: false,
+          t: false,
+          m: false,
+        };
+
+        day = moment();
+        dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
+        threeWeeksFromToday = moment().add(3, 'weeks').day(day.day()).toDate();
       });
 
       context('Current Date is one day before the matching day', () => {
@@ -620,7 +632,7 @@ describe('shouldDo', () => {
       dailyTask.everyX = 2;
       dailyTask.frequency = 'monthly';
       dailyTask.daysOfMonth = [15];
-      day = moment().date(15).toDate();
+      day = moment().add(2, 'months').date(15).toDate();
       expect(shouldDo(day, dailyTask, options)).to.equal(true);
     });
 

website/client-old/js/services/taskServices.js

@@ -390,11 +390,11 @@ angular.module('habitrpg')
     };
 
     function generateNextDue (task, user) {
-      let options = angular.copy(user);
+      var options = angular.copy(user);
       options.nextDue = true;
-      let nextDueDates = Shared.shouldDo(new Date, task, options);
+      var nextDueDates = Shared.shouldDo(new Date, task, options);
 
-      let nextDue = nextDueDates.map((date) => {
+      var nextDue = nextDueDates.map(function (date) {
         return date.format('MM-DD-YYYY');
       });
 

website/common/script/cron.js

@@ -128,7 +128,7 @@ export function shouldDo (day, dailyTask, options = {}) {
   } else if (dailyTask.frequency === 'weekly') {
     let schedule = moment(startDate).recur();
 
-    let differenceInWeeks = moment(day).week() - moment(startDate).week();
+    let differenceInWeeks = moment(startOfDayWithCDSTime).week() - moment(startDate).week();
     let matchEveryX = differenceInWeeks % dailyTask.everyX === 0;
 
     schedule = schedule.every(daysOfTheWeek).daysOfWeek();
@@ -147,7 +147,7 @@ export function shouldDo (day, dailyTask, options = {}) {
   } else if (dailyTask.frequency === 'monthly') {
     let schedule = moment(startDate).recur();
 
-    let differenceInMonths = moment(day).month() - moment(startDate).month();
+    let differenceInMonths = moment(startOfDayWithCDSTime).month() - moment(startDate).month();
     let matchEveryX = differenceInMonths % dailyTask.everyX === 0;
 
     if (dailyTask.weeksOfMonth && dailyTask.weeksOfMonth.length > 0) {