Skip to content

Commit 34bc1be

Browse files
committed
fix tests
1 parent 7fadec9 commit 34bc1be

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

src/lib/core/datetime/native-date-adapter.spec.ts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,11 @@ describe('NativeDateAdapter', () => {
196196
expect(adapter.parse(date)).not.toBe(date);
197197
});
198198

199-
it('should parse invalid value as null', () => {
200-
expect(adapter.parse('hello')).toBeNull();
199+
it('should parse invalid value as invalid', () => {
200+
let d = adapter.parse('hello');
201+
expect(d).not.toBeNull();
202+
expect(adapter.isDateInstance(d)).toBe(true);
203+
expect(adapter.isValid(d as Date)).toBe(false);
201204
});
202205

203206
it('should format', () => {
@@ -305,16 +308,24 @@ describe('NativeDateAdapter', () => {
305308
}
306309
});
307310

308-
it('should count a Date as a valid date object', () => {
309-
expect(adapter.isValid(new Date())).toBe(true);
311+
it('should count today as a valid date instance', () => {
312+
let d = new Date();
313+
expect(adapter.isValid(d)).toBe(true);
314+
expect(adapter.isDateInstance(d)).toBe(true);
315+
expect(adapter.getValidDateOrNull(d)).toBe(d);
310316
});
311317

312-
it('should not count a string as a valid date object', () => {
313-
expect(adapter.isValid('1/1/2017')).toBe(false);
318+
it('should count an invalid date as an invalid date instance', () => {
319+
let d = new Date(NaN);
320+
expect(adapter.isValid(d)).toBe(false);
321+
expect(adapter.isDateInstance(d)).toBe(true);
322+
expect(adapter.getValidDateOrNull(d)).toBeNull();
314323
});
315324

316-
it('should not count InvalidDate as a valid date object', () => {
317-
expect(adapter.isValid(new Date(NaN))).toBe(false);
325+
it('should count a string as not a date instance', () => {
326+
let d = '1/1/2017';
327+
expect(adapter.isDateInstance(d)).toBe(false);
328+
expect(adapter.getValidDateOrNull(d)).toBeNull();
318329
});
319330
});
320331

src/lib/datepicker/datepicker.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ class InputContainerDatepicker {
990990
})
991991
class DatepickerWithMinAndMaxValidation {
992992
@ViewChild('d') datepicker: MdDatepicker<Date>;
993-
date: Date;
993+
date: Date | null;
994994
minDate = new Date(2010, JAN, 1);
995995
maxDate = new Date(2020, JAN, 1);
996996
}

0 commit comments

Comments
 (0)