From 659b82f79889b8fa5def1a7cfe451e2311dfc2ba Mon Sep 17 00:00:00 2001 From: crisbeto Date: Fri, 9 Jun 2017 21:08:57 +0200 Subject: [PATCH] test(datepicker): set locale to en-US Currently, some of the datepicker tests will fail if the browser's locale is different from en-US. These changes set the locale to en-US in order to avoid potential issues in the future. --- src/lib/datepicker/datepicker.spec.ts | 9 ++++++++- src/lib/datepicker/month-view.spec.ts | 9 ++++++++- src/lib/datepicker/year-view.spec.ts | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts index e97446f54aab..bd1b48ba8e5a 100644 --- a/src/lib/datepicker/datepicker.spec.ts +++ b/src/lib/datepicker/datepicker.spec.ts @@ -8,7 +8,7 @@ import {By} from '@angular/platform-browser'; import {dispatchFakeEvent, dispatchMouseEvent} from '../core/testing/dispatch-events'; import {MdInputModule} from '../input/index'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {MdNativeDateModule} from '../core/datetime/index'; +import {MdNativeDateModule, DateAdapter, NativeDateAdapter} from '../core/datetime/index'; // When constructing a Date, the month is zero-based. This can be confusing, since people are @@ -29,6 +29,13 @@ describe('MdDatepicker', () => { NoopAnimationsModule, ReactiveFormsModule, ], + providers: [ + {provide: DateAdapter, useFactory: () => { + let adapter = new NativeDateAdapter(); + adapter.setLocale('en-US'); + return adapter; + }} + ], declarations: [ DatepickerWithFilterAndValidation, DatepickerWithFormControl, diff --git a/src/lib/datepicker/month-view.spec.ts b/src/lib/datepicker/month-view.spec.ts index 9cef08b5897f..7a7760bf4224 100644 --- a/src/lib/datepicker/month-view.spec.ts +++ b/src/lib/datepicker/month-view.spec.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; import {MdMonthView} from './month-view'; import {MdCalendarBody} from './calendar-body'; -import {MdNativeDateModule} from '../core/datetime/index'; +import {MdNativeDateModule, DateAdapter, NativeDateAdapter} from '../core/datetime/index'; // When constructing a Date, the month is zero-based. This can be confusing, since people are @@ -18,6 +18,13 @@ describe('MdMonthView', () => { imports: [ MdNativeDateModule, ], + providers: [ + {provide: DateAdapter, useFactory: () => { + let adapter = new NativeDateAdapter(); + adapter.setLocale('en-US'); + return adapter; + }} + ], declarations: [ MdCalendarBody, MdMonthView, diff --git a/src/lib/datepicker/year-view.spec.ts b/src/lib/datepicker/year-view.spec.ts index 496938f7842d..b937b1e81875 100644 --- a/src/lib/datepicker/year-view.spec.ts +++ b/src/lib/datepicker/year-view.spec.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; import {MdYearView} from './year-view'; import {MdCalendarBody} from './calendar-body'; -import {MdNativeDateModule} from '../core/datetime/index'; +import {MdNativeDateModule, DateAdapter, NativeDateAdapter} from '../core/datetime/index'; // When constructing a Date, the month is zero-based. This can be confusing, since people are @@ -18,6 +18,13 @@ describe('MdYearView', () => { imports: [ MdNativeDateModule, ], + providers: [ + {provide: DateAdapter, useFactory: () => { + let adapter = new NativeDateAdapter(); + adapter.setLocale('en-US'); + return adapter; + }} + ], declarations: [ MdCalendarBody, MdYearView,