chore: upgrade calendar-utils

mattlewis92 · Dec 30, 2017 · faaac8f · faaac8f
1 parent 44d710a
commit faaac8f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "angular": "^1.6.8",
     "angular-mocks": "^1.6.8",
     "bootstrap": "^3.3.6",
-    "calendar-utils": "0.0.59",
+    "calendar-utils": "0.0.60",
     "codecov-lite": "^0.1.3",
     "commitizen": "^2.9.2",
     "concurrently": "^3.5.1",

diff --git a/src/services/calendarHelper.js b/src/services/calendarHelper.js
@@ -223,7 +223,7 @@ angular
 
           return calendarUtilsEvent;
         })
-      }).map(function(eventRow) {
+      }).eventRows.map(function(eventRow) {
 
         eventRow.row = eventRow.row.map(function(rowEvent) {
           rowEvent.event = rowEvent.event.originalEvent;

diff --git a/test/unit/directives/mwlCalendarWeek.spec.js b/test/unit/directives/mwlCalendarWeek.spec.js
@@ -89,13 +89,13 @@ describe('mwlCalendarWeek directive', function() {
 
   it('should get the new week view when calendar refreshes', function() {
     sinon.stub(calendarHelper, 'getDayViewHeight').returns(1000);
-    sinon.stub(calendarHelper, 'getWeekView').returns({event: 'event1'});
+    sinon.stub(calendarHelper, 'getWeekView').returns({eventRows: [{event: 'event1'}]});
     sinon.stub(calendarHelper, 'getWeekViewWithTimes').returns({event: 'event2'});
     scope.$broadcast('calendar.refreshView');
     expect(calendarHelper.getDayViewHeight).to.have.been.calledWith('06:00', '22:59', 30);
     expect(MwlCalendarCtrl.dayViewHeight).to.equal(1000);
     expect(calendarHelper.getWeekView).to.have.been.calledWith(scope.events, scope.viewDate);
-    expect(MwlCalendarCtrl.view).to.eql({event: 'event1'});
+    expect(MwlCalendarCtrl.view).to.eql({eventRows: [{event: 'event1'}]});
 
     MwlCalendarCtrl.showTimes = true;
     scope.$broadcast('calendar.refreshView');