fix(uiDateMask): lock date-fns version (2.0.0-alpha.7) and fix date m…

…ask tests
assisrafael · Jun 18, 2018 · a785dc9 · a785dc9
1 parent dbfe5ff
commit a785dc9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -30,8 +30,7 @@
   "license": "MIT",
   "dependencies": {
     "br-validations": "^0.3.1",
-    "date-fns": "^2.0.0-alpha.7",
-    "moment": "^2.8.4",
+    "date-fns": "2.0.0-alpha.7",
     "string-mask": "^0.3.0"
   },
   "devDependencies": {

diff --git a/src/global/date/date.js b/src/global/date/date.js
@@ -10,19 +10,19 @@ function isISODateString(date) {
 		.test(date.toString());
 }
 
-function DateMaskDirective($locale) {
-	var dateFormatMapByLocale = {
-		'pt-br': 'DD/MM/YYYY',
-		'es-ar': 'DD/MM/YYYY',
-		'es-mx': 'DD/MM/YYYY',
-		'es'   : 'DD/MM/YYYY',
-		'en-us': 'MM/DD/YYYY',
-		'en'   : 'MM/DD/YYYY',
-		'fr-fr': 'DD/MM/YYYY',
-		'fr'   : 'DD/MM/YYYY',
-		'ru'   : 'DD.MM.YYYY'
-	};
+var dateFormatMapByLocale = {
+	'pt-br': 'DD/MM/YYYY',
+	'es-ar': 'DD/MM/YYYY',
+	'es-mx': 'DD/MM/YYYY',
+	'es'   : 'DD/MM/YYYY',
+	'en-us': 'MM/DD/YYYY',
+	'en'   : 'MM/DD/YYYY',
+	'fr-fr': 'DD/MM/YYYY',
+	'fr'   : 'DD/MM/YYYY',
+	'ru'   : 'DD.MM.YYYY'
+};
 
+function DateMaskDirective($locale) {
 	var dateFormat = dateFormatMapByLocale[$locale.id] || 'YYYY-MM-DD';
 
 	return {

diff --git a/src/global/date/date.spec.js b/src/global/date/date.spec.js
@@ -27,7 +27,7 @@ describe('uiDateMask', function() {
 				expect(input.getAttribute('value')).toEqual(formatedDateAsString);
 			}
 
-			expect(value.evaluate('dateMask.toString()')).toEqual(parseDate(formatedDateAsString, 'YYYY-MM-DD', new Date()).toString());
+			expect(value.evaluate('dateMask.toISOString()')).toEqual(parseDate(formatedDateAsString, 'YYYY-MM-DD', new Date()).toISOString());
 
 			for (i = 7; i >= 0; i--) {
 				input.sendKeys(protractor.Key.BACK_SPACE);
@@ -60,7 +60,7 @@ describe('uiDateMask', function() {
 		});
 
 		it('should be valid if the model is a valid date', function() {
-			var inputKeysToSend = '19991231';
+			var inputKeysToSend = '12311999';
 
 			var input = element(by.model('dateMask')),
 				valid = element(by.binding('form.dateMaskInput.$error'));
@@ -106,7 +106,7 @@ describe('uiDateMask', function() {
 				expect(input.getAttribute('value')).toEqual(formatedDateAsString);
 			}
 
-			expect(value.evaluate('dateMask.toString()')).toEqual(parseDate(formatedDateAsString, 'DD/MM/YYYY', new Date()).toString());
+			expect(value.evaluate('dateMask.toISOString()')).toEqual(parseDate(formatedDateAsString, 'DD/MM/YYYY', new Date()).toISOString());
 
 			for (i = 7; i >= 0; i--) {
 				input.sendKeys(protractor.Key.BACK_SPACE);

diff --git a/src/global/date/date.test.js b/src/global/date/date.test.js
@@ -29,7 +29,7 @@ describe('ui-date-mask', function() {
 		});
 
 		var model = input.controller('ngModel');
-		expect(model.$viewValue).toBe(date.toLocaleDateString());
+		expect(model.$viewValue).toBe('12/31/1999');
 	});
 
 	it('should use specified mask', function() {