Skip to content

Commit a785dc9

Browse files
committed
fix(uiDateMask): lock date-fns version (2.0.0-alpha.7) and fix date mask tests
1 parent dbfe5ff commit a785dc9

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
"license": "MIT",
3131
"dependencies": {
3232
"br-validations": "^0.3.1",
33-
"date-fns": "^2.0.0-alpha.7",
34-
"moment": "^2.8.4",
33+
"date-fns": "2.0.0-alpha.7",
3534
"string-mask": "^0.3.0"
3635
},
3736
"devDependencies": {

src/global/date/date.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ function isISODateString(date) {
1010
.test(date.toString());
1111
}
1212

13-
function DateMaskDirective($locale) {
14-
var dateFormatMapByLocale = {
15-
'pt-br': 'DD/MM/YYYY',
16-
'es-ar': 'DD/MM/YYYY',
17-
'es-mx': 'DD/MM/YYYY',
18-
'es' : 'DD/MM/YYYY',
19-
'en-us': 'MM/DD/YYYY',
20-
'en' : 'MM/DD/YYYY',
21-
'fr-fr': 'DD/MM/YYYY',
22-
'fr' : 'DD/MM/YYYY',
23-
'ru' : 'DD.MM.YYYY'
24-
};
13+
var dateFormatMapByLocale = {
14+
'pt-br': 'DD/MM/YYYY',
15+
'es-ar': 'DD/MM/YYYY',
16+
'es-mx': 'DD/MM/YYYY',
17+
'es' : 'DD/MM/YYYY',
18+
'en-us': 'MM/DD/YYYY',
19+
'en' : 'MM/DD/YYYY',
20+
'fr-fr': 'DD/MM/YYYY',
21+
'fr' : 'DD/MM/YYYY',
22+
'ru' : 'DD.MM.YYYY'
23+
};
2524

25+
function DateMaskDirective($locale) {
2626
var dateFormat = dateFormatMapByLocale[$locale.id] || 'YYYY-MM-DD';
2727

2828
return {

src/global/date/date.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('uiDateMask', function() {
2727
expect(input.getAttribute('value')).toEqual(formatedDateAsString);
2828
}
2929

30-
expect(value.evaluate('dateMask.toString()')).toEqual(parseDate(formatedDateAsString, 'YYYY-MM-DD', new Date()).toString());
30+
expect(value.evaluate('dateMask.toISOString()')).toEqual(parseDate(formatedDateAsString, 'YYYY-MM-DD', new Date()).toISOString());
3131

3232
for (i = 7; i >= 0; i--) {
3333
input.sendKeys(protractor.Key.BACK_SPACE);
@@ -60,7 +60,7 @@ describe('uiDateMask', function() {
6060
});
6161

6262
it('should be valid if the model is a valid date', function() {
63-
var inputKeysToSend = '19991231';
63+
var inputKeysToSend = '12311999';
6464

6565
var input = element(by.model('dateMask')),
6666
valid = element(by.binding('form.dateMaskInput.$error'));
@@ -106,7 +106,7 @@ describe('uiDateMask', function() {
106106
expect(input.getAttribute('value')).toEqual(formatedDateAsString);
107107
}
108108

109-
expect(value.evaluate('dateMask.toString()')).toEqual(parseDate(formatedDateAsString, 'DD/MM/YYYY', new Date()).toString());
109+
expect(value.evaluate('dateMask.toISOString()')).toEqual(parseDate(formatedDateAsString, 'DD/MM/YYYY', new Date()).toISOString());
110110

111111
for (i = 7; i >= 0; i--) {
112112
input.sendKeys(protractor.Key.BACK_SPACE);

src/global/date/date.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('ui-date-mask', function() {
2929
});
3030

3131
var model = input.controller('ngModel');
32-
expect(model.$viewValue).toBe(date.toLocaleDateString());
32+
expect(model.$viewValue).toBe('12/31/1999');
3333
});
3434

3535
it('should use specified mask', function() {

0 commit comments

Comments
 (0)