fix broken tests

Author: mmalerba

src/lib/datepicker/calendar.spec.ts

@@ -1,4 +1,3 @@
-/*
 import {
   DOWN_ARROW,
   END,
@@ -33,6 +32,7 @@ import {MatCalendar} from './calendar';
 import {MatCalendarBody} from './calendar-body';
 import {MatDatepickerIntl} from './datepicker-intl';
 import {MatMonthView} from './month-view';
+import {MatMultiYearView} from './multi-year-view';
 import {MatYearView} from './year-view';
 
 
@@ -48,6 +48,7 @@ describe('MatCalendar', () => {
         MatCalendarBody,
         MatMonthView,
         MatYearView,
+        MatMultiYearView,
 
         // Test components.
         StandardCalendar,
@@ -86,22 +87,22 @@ describe('MatCalendar', () => {
     });
 
     it('should be in month view with specified month active', () => {
-      expect(calendarInstance._monthView).toBe(true, 'should be in month view');
+      expect(calendarInstance._currentView).toBe('month');
       expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 31));
     });
 
     it('should toggle view when period clicked', () => {
-      expect(calendarInstance._monthView).toBe(true, 'should be in month view');
+      expect(calendarInstance._currentView).toBe('month');
 
       periodButton.click();
       fixture.detectChanges();
 
-      expect(calendarInstance._monthView).toBe(false, 'should be in year view');
+      expect(calendarInstance._currentView).toBe('multi-year');
 
       periodButton.click();
       fixture.detectChanges();
 
-      expect(calendarInstance._monthView).toBe(true, 'should be in month view');
+      expect(calendarInstance._currentView).toBe('month');
     });
 
     it('should go to next and previous month', () => {
@@ -122,9 +123,14 @@ describe('MatCalendar', () => {
       periodButton.click();
       fixture.detectChanges();
 
-      expect(calendarInstance._monthView).toBe(false, 'should be in year view');
+      expect(calendarInstance._currentView).toBe('multi-year');
       expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 31));
 
+      (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+      fixture.detectChanges();
+
+      expect(calendarInstance._currentView).toBe('year');
+
       nextButton.click();
       fixture.detectChanges();
 
@@ -136,19 +142,26 @@ describe('MatCalendar', () => {
       expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 31));
     });
 
-    it('should go back to month view after selecting month in year view', () => {
+    it('should go back to month view after selecting year and month', () => {
       periodButton.click();
       fixture.detectChanges();
 
-      expect(calendarInstance._monthView).toBe(false, 'should be in year view');
+      expect(calendarInstance._currentView).toBe('multi-year');
       expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 31));
 
+      let yearCells = calendarElement.querySelectorAll('.mat-calendar-body-cell');
+      (<HTMLElement>yearCells[0]).click();
+      fixture.detectChanges();
+
+      expect(calendarInstance._currentView).toBe('year');
+      expect(calendarInstance._activeDate).toEqual(new Date(2016, JAN, 31));
+
       let monthCells = calendarElement.querySelectorAll('.mat-calendar-body-cell');
       (monthCells[monthCells.length - 1] as HTMLElement).click();
       fixture.detectChanges();
 
-      expect(calendarInstance._monthView).toBe(true, 'should be in month view');
-      expect(calendarInstance._activeDate).toEqual(new Date(2017, DEC, 31));
+      expect(calendarInstance._currentView).toBe('month');
+      expect(calendarInstance._activeDate).toEqual(new Date(2016, DEC, 31));
       expect(testComponent.selected).toBeFalsy('no date should be selected yet');
     });
 
@@ -157,7 +170,7 @@ describe('MatCalendar', () => {
       (monthCells[monthCells.length - 1] as HTMLElement).click();
       fixture.detectChanges();
 
-      expect(calendarInstance._monthView).toBe(true, 'should be in month view');
+      expect(calendarInstance._currentView).toBe('month');
       expect(testComponent.selected).toEqual(new Date(2017, JAN, 31));
     });
 
@@ -166,11 +179,11 @@ describe('MatCalendar', () => {
         const button = fixture.debugElement.nativeElement
             .querySelector('.mat-calendar-period-button');
 
-        intl.switchToYearViewLabel = 'Go to year view?';
+        intl.switchToMultiYearViewLabel = 'Go to multi-year view?';
         intl.changes.next();
         fixture.detectChanges();
 
-        expect(button.getAttribute('aria-label')).toBe('Go to year view?');
+        expect(button.getAttribute('aria-label')).toBe('Go to multi-year view?');
       }));
 
     describe('a11y', () => {
@@ -312,7 +325,12 @@ describe('MatCalendar', () => {
             dispatchMouseEvent(periodButton, 'click');
             fixture.detectChanges();
 
-            expect(calendarInstance._monthView).toBe(false);
+            expect(calendarInstance._currentView).toBe('multi-year');
+
+            (<HTMLElement>calendarBodyEl.querySelector('.mat-calendar-body-active')).click();
+            fixture.detectChanges();
+
+            expect(calendarInstance._currentView).toBe('year');
           });
 
           it('should decrement month on left arrow press', () => {
@@ -449,7 +467,7 @@ describe('MatCalendar', () => {
             dispatchKeyboardEvent(calendarBodyEl, 'keydown', ENTER);
             fixture.detectChanges();
 
-            expect(calendarInstance._monthView).toBe(true);
+            expect(calendarInstance._currentView).toBe('month');
             expect(calendarInstance._activeDate).toEqual(new Date(2017, FEB, 28));
             expect(testComponent.selected).toBeUndefined();
           });
@@ -558,6 +576,9 @@ describe('MatCalendar', () => {
       periodButton.click();
       fixture.detectChanges();
 
+      (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+      fixture.detectChanges();
+
       spyOn(calendarInstance.yearView, '_init').and.callThrough();
 
       testComponent.minDate = new Date(2017, NOV, 1);
@@ -573,6 +594,9 @@ describe('MatCalendar', () => {
       periodButton.click();
       fixture.detectChanges();
 
+      (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+      fixture.detectChanges();
+
       spyOn(calendarInstance.yearView, '_init').and.callThrough();
 
       testComponent.maxDate = new Date(2017, DEC, 1);
@@ -624,7 +648,7 @@ describe('MatCalendar', () => {
       });
 
       it('should not allow selection of disabled date in month view', () => {
-        expect(calendarInstance._monthView).toBe(true);
+        expect(calendarInstance._currentView).toBe('month');
         expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 1));
 
         dispatchKeyboardEvent(calendarBodyEl, 'keydown', ENTER);
@@ -639,15 +663,18 @@ describe('MatCalendar', () => {
         dispatchMouseEvent(periodButton, 'click');
         fixture.detectChanges();
 
+        (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+        fixture.detectChanges();
+
         calendarInstance._activeDate = new Date(2017, NOV, 1);
         fixture.detectChanges();
 
-        expect(calendarInstance._monthView).toBe(false);
+        expect(calendarInstance._currentView).toBe('year');
 
         dispatchKeyboardEvent(calendarBodyEl, 'keydown', ENTER);
         fixture.detectChanges();
 
-        expect(calendarInstance._monthView).toBe(true);
+        expect(calendarInstance._currentView).toBe('month');
         expect(testComponent.selected).toBeUndefined();
       });
     });
@@ -690,4 +717,3 @@ class CalendarWithDateFilter {
     return date.getDate() % 2 == 0 && date.getMonth() != NOV;
   }
 }
-*/