File tree Expand file tree Collapse file tree 2 files changed +18
-2
lines changed Expand file tree Collapse file tree 2 files changed +18
-2
lines changed Original file line number Diff line number Diff line change 1
1
import { Directionality } from '@angular/cdk/bidi' ;
2
2
import { Component } from '@angular/core' ;
3
3
import { async , ComponentFixture , TestBed } from '@angular/core/testing' ;
4
- import { MatNativeDateModule } from '@angular/material/core' ;
4
+ import { MatNativeDateModule , DateAdapter } from '@angular/material/core' ;
5
5
import { DEC , FEB , JAN } from '@angular/material/testing' ;
6
6
import { By } from '@angular/platform-browser' ;
7
7
import { MatCalendar } from './calendar' ;
@@ -149,6 +149,18 @@ describe('MatCalendarHeader', () => {
149
149
expect ( calendarInstance . activeDate ) . toEqual ( new Date ( 2016 , DEC , 31 ) ) ;
150
150
expect ( testComponent . selected ) . toBeFalsy ( 'no date should be selected yet' ) ;
151
151
} ) ;
152
+
153
+ it ( 'should format the year in the period button using the date adapter' , ( ) => {
154
+ const adapter = fixture . debugElement . injector . get ( DateAdapter ) ;
155
+
156
+ spyOn ( adapter , 'getYearName' ) . and . returnValue ( 'FAKE_YEAR' ) ;
157
+
158
+ periodButton . click ( ) ;
159
+ fixture . detectChanges ( ) ;
160
+
161
+ expect ( calendarInstance . currentView ) . toBe ( 'multi-year' ) ;
162
+ expect ( periodButton . textContent ) . toContain ( 'FAKE_YEAR' ) ;
163
+ } ) ;
152
164
} ) ;
153
165
154
166
describe ( 'calendar with minDate only' , ( ) => {
Original file line number Diff line number Diff line change @@ -82,7 +82,11 @@ export class MatCalendarHeader<D> {
82
82
const minYearOfPage = activeYear - getActiveOffset (
83
83
this . _dateAdapter , this . calendar . activeDate , this . calendar . minDate , this . calendar . maxDate ) ;
84
84
const maxYearOfPage = minYearOfPage + yearsPerPage - 1 ;
85
- return `${ minYearOfPage } \u2013 ${ maxYearOfPage } ` ;
85
+ const minYearName =
86
+ this . _dateAdapter . getYearName ( this . _dateAdapter . createDate ( minYearOfPage , 0 , 1 ) ) ;
87
+ const maxYearName =
88
+ this . _dateAdapter . getYearName ( this . _dateAdapter . createDate ( maxYearOfPage , 0 , 1 ) ) ;
89
+ return `${ minYearName } \u2013 ${ maxYearName } ` ;
86
90
}
87
91
88
92
get periodButtonLabel ( ) : string {
You can’t perform that action at this time.
0 commit comments