From 65dffc99fadc34c1d01dbe1ccb1c8a836ba3634f Mon Sep 17 00:00:00 2001 From: houmark Date: Sat, 30 Apr 2016 18:12:28 -0500 Subject: [PATCH 1/3] Fix validation issues --- src/us/phone/us-phone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/us/phone/us-phone.js b/src/us/phone/us-phone.js index 0dbcd2d5..48702f14 100644 --- a/src/us/phone/us-phone.js +++ b/src/us/phone/us-phone.js @@ -23,7 +23,7 @@ module.exports = maskFactory({ }, validations: { usPhoneNumber: function(value) { - return value.length > 9; + return value && value.toString().length > 9; } } }); From f649ff8ad88ef8745c218d66ab374ca4336b342b Mon Sep 17 00:00:00 2001 From: Lars Houmark Date: Fri, 26 Aug 2016 18:35:16 -0500 Subject: [PATCH 2/3] Add test case for validation of US phone number Model value is added as a number which ensures it can validate (which is what this PR is for). I noticed other tests are adding the phone number as a string (in br-phone.test.js), which probably defeats the test. --- src/us/phone/us-phone.test.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/us/phone/us-phone.test.js b/src/us/phone/us-phone.test.js index c868530a..eb53613e 100644 --- a/src/us/phone/us-phone.test.js +++ b/src/us/phone/us-phone.test.js @@ -52,4 +52,17 @@ describe('ui-us-phone-mask', function() { expect(model.$modelValue).toBe(test.modelValue); }); }); + + it('should validate a phone number', function() { + var input = TestUtil.compile('', { + model: 30112 + }); + var model = input.controller('ngModel'); + expect(model.$valid).toBe(false); + expect(model.$error.usPhoneNumber).toBe(true); + input.val(3011201034).triggerHandler('input'); + expect(model.$valid).toBe(true); + expect(model.$error.usPhoneNumber).toBeUndefined(); + }); + }); From 68d83bdee713a74c6bd1087083783e91cc93494d Mon Sep 17 00:00:00 2001 From: Lars Houmark Date: Fri, 26 Aug 2016 19:01:24 -0500 Subject: [PATCH 3/3] Fix mixed tabs and spaces which prevents tests from passing --- src/us/phone/us-phone.test.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/us/phone/us-phone.test.js b/src/us/phone/us-phone.test.js index eb53613e..a690547f 100644 --- a/src/us/phone/us-phone.test.js +++ b/src/us/phone/us-phone.test.js @@ -53,16 +53,16 @@ describe('ui-us-phone-mask', function() { }); }); - it('should validate a phone number', function() { - var input = TestUtil.compile('', { - model: 30112 - }); - var model = input.controller('ngModel'); - expect(model.$valid).toBe(false); - expect(model.$error.usPhoneNumber).toBe(true); - input.val(3011201034).triggerHandler('input'); - expect(model.$valid).toBe(true); - expect(model.$error.usPhoneNumber).toBeUndefined(); - }); + it('should validate a phone number', function() { + var input = TestUtil.compile('', { + model: 30112 + }); + var model = input.controller('ngModel'); + expect(model.$valid).toBe(false); + expect(model.$error.usPhoneNumber).toBe(true); + input.val(3011201034).triggerHandler('input'); + expect(model.$valid).toBe(true); + expect(model.$error.usPhoneNumber).toBeUndefined(); + }); });