Browse Source

Refactor test suite for color validator.
Create Test cases for validation messages for color Test suite

Emil Rømer Christensen 11 years ago
parent
commit
e98ee9d8ee

+ 4 - 0
dist/css/bootstrapValidator.min.css

@@ -25,6 +25,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
@@ -95,6 +96,9 @@
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 10:04:30 PM
 >>>>>>> Refactor to use dynamic method calling substantialy reducing code length
+=======
+ * @version     v0.5.2-dev, built on 2014-09-18 10:04:40 PM
+>>>>>>> Refactor test suite for color validator.
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

+ 17 - 6
dist/js/bootstrapValidator.js

@@ -25,6 +25,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
@@ -95,6 +96,9 @@
 =======
  * @version     v0.5.2-dev, built on 2014-09-18 10:04:30 PM
 >>>>>>> Refactor to use dynamic method calling substantialy reducing code length
+=======
+ * @version     v0.5.2-dev, built on 2014-09-18 10:04:40 PM
+>>>>>>> Refactor test suite for color validator.
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT
@@ -2297,20 +2301,27 @@ if (typeof jQuery === 'undefined') {
                 return true;
             }
 
-            var method;
+            var method, type;
             var defaultTypes = ['hex', 'rgb', 'rgba', 'hsl', 'hsla', 'keyword'];
             var useCustomTypes = (options.hasOwnProperty('type') && options.type instanceof Array);
             var types = useCustomTypes ? options.type : defaultTypes;
             var isValid = false;
+            var formatedMessage = $.fn.bootstrapValidator.helpers.format(
+                                        options.message || (useCustomTypes ? $.fn.bootstrapValidator.i18n.color.type : $.fn.bootstrapValidator.i18n.color.default),
+                                        types.join(", ")
+            );
 
-            for (var i = 0; i<types.length; i++) {
-                var type = types[i];
-                message = useCustomTypes ? $.fn.bootstrapValidator.i18n.color.type : $.fn.bootstrapValidator.i18n.color.default;
-                method = ['_', type.toLowerCase()].join('');
+            for (var i = 0; i < types.length; i++) {
+                type = types[i];
+                method = '_' + type.toLowerCase();
                 isValid = isValid || this[method](value);
+                if (isValid) return true;
             }
 
-            return isValid || { valid: false, message: message };
+            return {
+                valid: false,
+                message: formatedMessage
+            };
         },
 
         _hex: function(value) {

File diff suppressed because it is too large
+ 8 - 0
dist/js/bootstrapValidator.min.js


File diff suppressed because it is too large
+ 437 - 417
test/spec.js


File diff suppressed because it is too large
+ 437 - 417
test/spec/validator/color.js