fix(input): use Chromium's email validation regexp

caitp · caitp · commit 79e519fedaec · 2014-01-21T21:40:55.000-05:00
This change uses the regexp from Chromium/Blink to validate emails, and corrects an error in the validation engine, which previously considered an invalid email to be valid. Additionally, the regexp was invalidating emails with capital letters, however this is not the behaviour recomended in the spec, or implemented in Chromium. Closes angular#5899 Closes angular#5924
diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js
@@ -9,7 +9,7 @@
 */
 
 var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
-var EMAIL_REGEXP = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}$/;
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i;
 var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
 
 var inputType = {
diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
@@ -944,7 +944,8 @@ describe('input', function() {
       it('should validate email', function() {
         expect(EMAIL_REGEXP.test('a@b.com')).toBe(true);
         expect(EMAIL_REGEXP.test('a@b.museum')).toBe(true);
-        expect(EMAIL_REGEXP.test('a@B.c')).toBe(false);
+        expect(EMAIL_REGEXP.test('a@B.c')).toBe(true);
+        expect(EMAIL_REGEXP.test('a@.b.c')).toBe(false);
       });
     });
   });

-Original file line number
+Diff line change
       it('should validate email', function() {
         expect(EMAIL_REGEXP.test('[email protected]')).toBe(true);
         expect(EMAIL_REGEXP.test('[email protected]')).toBe(true);
 -        expect(EMAIL_REGEXP.test('[email protected]')).toBe(false);
 +        expect(EMAIL_REGEXP.test('[email protected]')).toBe(true);
 +        expect(EMAIL_REGEXP.test('[email protected]')).toBe(false);
       });
     });
   });