Email validation for @localhost address + tests

See r80694 commit note

diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 65936af..497bb33 100644 (file)
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -501,8 +501,8 @@
                                        // Domain first part
                                        '[' + rfc1034_ldh_str + ']+'
                                        +
-                                       // Second part and following are separated by a dot
-                                       '(?:\\.[' + rfc1034_ldh_str + ']+)+'
+                                       // Optional second part and following are separated by a dot
+                                       '(?:\\.[' + rfc1034_ldh_str + ']+)*'
                                        +
                                        // End of string
                                        '$',

diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
index f99e8e4..33e2118 100644 (file)
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ b/resources/mediawiki.util/mediawiki.util.test.js
@@ -279,6 +279,16 @@
                                                mw.test.addTest( 'typeof $.fn.makeCollapsible',
                                                        'function (string)' );
 
+                                               // Email validation
+                                               // TODO: import tests from PHPUnit test suite
+                                               mw.test.addHead( 'Email validation' );
+
+                                               mw.test.addTest( 'mw.util.validateEmail( "" )',
+                                                       'null (object)' );
+
+                                               mw.test.addTest( 'mw.util.validateEmail( "user@localhost" )',
+                                                       'true (boolean)' );
+
                                                // Run tests and compare results
                                                var     exec,
                                                        result,
@@ -326,4 +336,4 @@
 
        mediaWiki.test.init();
 
-} )(jQuery, mediaWiki);
\ No newline at end of file
+} )(jQuery, mediaWiki);