fix(calendar): fix broken unit tests for component rename and focus

changes.

Author: jelbourn

src/components/calendar/calendar.js

@@ -14,7 +14,6 @@
 
 
   // PRE RELEASE
-  // TODO(jelbourn): read-only state.
   // TODO(jelbourn): Date "isComplete" logic
   // TODO(jelbourn): Fix NVDA stealing key presses (IE) ???
 
@@ -26,6 +25,7 @@
   // TODO(jelbourn): Previous month opacity is lowered when partially scrolled out of view.
   // TODO(jelbourn): Support md-calendar standalone on a page (as a tabstop w/ aria-live
   //     announcement and key handling).
+  // Read-only calendar (not just date-picker).
 
   // COULD GO EITHER WAY
   // TODO(jelbourn): Clicking on the month label opens the month-picker.

src/components/calendar/calendar.spec.js

@@ -87,6 +87,10 @@ describe('md-calendar', function() {
     });
   }
 
+  function getFocusedDateElement() {
+    return element.querySelector('.md-focus');
+  }
+
   beforeEach(module('material.components.calendar', 'ngAnimateMock'));
 
   beforeEach(inject(function($injector) {
@@ -221,48 +225,48 @@ describe('md-calendar', function() {
       selectedDate.focus();
 
       dispatchKeyEvent(keyCodes.LEFT_ARROW);
-      expect(document.activeElement.textContent).toBe('10');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('10');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.UP_ARROW);
-      expect(document.activeElement.textContent).toBe('3');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('3');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.RIGHT_ARROW);
-      expect(document.activeElement.textContent).toBe('4');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('4');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.DOWN_ARROW);
-      expect(document.activeElement.textContent).toBe('11');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('11');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.HOME);
-      expect(document.activeElement.textContent).toBe('1');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('1');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.END);
-      expect(document.activeElement.textContent).toBe('28');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('28');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.RIGHT_ARROW);
-      expect(document.activeElement.textContent).toBe('1');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Mar 2014');
+      expect(getFocusedDateElement().textContent).toBe('1');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Mar 2014');
 
       dispatchKeyEvent(keyCodes.PAGE_UP);
-      expect(document.activeElement.textContent).toBe('1');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('1');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.PAGE_DOWN);
-      expect(document.activeElement.textContent).toBe('1');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Mar 2014');
+      expect(getFocusedDateElement().textContent).toBe('1');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Mar 2014');
 
       dispatchKeyEvent(keyCodes.UP_ARROW, {meta: true});
-      expect(document.activeElement.textContent).toBe('1');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Feb 2014');
+      expect(getFocusedDateElement().textContent).toBe('1');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Feb 2014');
 
       dispatchKeyEvent(keyCodes.DOWN_ARROW, {meta: true});
-      expect(document.activeElement.textContent).toBe('1');
-      expect(getMonthLabelForDateCell(document.activeElement)).toBe('Mar 2014');
+      expect(getFocusedDateElement().textContent).toBe('1');
+      expect(getMonthLabelForDateCell(getFocusedDateElement())).toBe('Mar 2014');
 
       dispatchKeyEvent(keyCodes.ENTER);
       applyDateChange();

src/components/calendar/datePicker.js

@@ -4,12 +4,13 @@
   // PRE RELEASE
   // TODO(jelbourn): Documentation
   // TODO(jelbourn): Demo that uses moment.js
+
   // TODO(jelbourn): aria attributes tying together date input and floating calendar.
   // TODO(jelbourn): make sure this plays well with validation and ngMessages.
-  // TODO(jelbourn): forward more attributes to the internal input (required, autofocus, etc.)
   // TODO(jelbourn): auto-grow input to accomodate longer dates
 
   // POST RELEASE
+  // TODO(jelbourn): forward more attributes to the internal input (required, autofocus, etc.)
   // TODO(jelbourn): error state
   // TODO(jelbourn): something better for mobile (calendar panel takes up entire screen?)
   // TODO(jelbourn): input behavior (masking? auto-complete?)

src/components/calendar/datePicker.spec.js

@@ -24,12 +24,12 @@ describe('md-date-picker', function() {
     pageScope.myDate = initialDate;
     pageScope.isDisabled = false;
 
-    var template = '<md-date-picker ng-model="myDate" ng-disabled="isDisabled"></md-date-picker>';
+    var template = '<md-datepicker ng-model="myDate" ng-disabled="isDisabled"></md-datepicker>';
     ngElement = $compile(template)(pageScope);
     $rootScope.$apply();
 
     scope = ngElement.scope();
-    controller = ngElement.controller('mdDatePicker');
+    controller = ngElement.controller('mdDatepicker');
     element = ngElement[0];
   }));