fix anniversary logic/test that fails in December (bah humbug!)

Author: Jeddf

src/dashboard/cd-dashboard-dojo-anniversary.vue

@@ -30,11 +30,14 @@
       },
       hasAnniversary(dojo) {
         const now = moment();
-        const referenceDate = moment(dojo.created);
-        referenceDate.year(now.year());
-        const timeToAnniversary = now.diff(referenceDate, 'months');
+        const nextAnniversary = moment(dojo.created);
+        nextAnniversary.year(now.year());
+        if (now.isAfter(nextAnniversary)) {
+          nextAnniversary.add(1, 'year');
+        }
+        const timeToAnniversary = nextAnniversary.diff(now, 'months');
         // Note: this won't be exact due to the user's tz and the creation date being in IST
-        return timeToAnniversary >= -2 && timeToAnniversary <= 0 && now <= referenceDate;
+        return timeToAnniversary <= 2;
       },
       championOfDojos(dojos, dojoAdmins) {
         return dojoAdmins.reduce((acc, membership) => {

test/unit/specs/dashboard/cd-dashboard-dojo-anniversary.spec.js

@@ -39,6 +39,12 @@ describe('Dashboard dojo anniversary component', () => {
         created.subtract(1, 'days');
         expect(vm.hasAnniversary({ created })).to.be.false;
       });
+      it('should return true if anniversary is within 2 months and next year', () => {
+        clock = sinon.useFakeTimers(new Date(2018, 11, 12, 0, 0, 0, 0));
+        const created = moment();
+        created.add(1, 'months');
+        expect(vm.hasAnniversary({ created })).to.be.true;
+      });
     });
     describe('isOld', () => {
       it('should return true if the dojo is at least 10 month old', () => {