add validator tests

Author: ZAYEC77

README.md

@@ -132,10 +132,10 @@ app.config(['FormusValidatorProvider', function (FormusValidatorProvider) {
   });
 }]);
 ```
-Validator function can take three parameters:
-- field value
-- field config
-- validator options
+Validator function is called by $injector and has three special parameters:
+- `value` - field value
+- `config` - field config
+- `args` - validator options
 
 This validator can take options as object with property `min`, e.g:
 ```js

app/js/formus.js

@@ -179,7 +179,7 @@ formus.directive('formusField', function($injector, $http, $compile, $log, $temp
                 }
             };
 
-            $scope.$on('Formus.validate', function() {
+            $scope.$on('Formus.validate', function(e) {
                 if (!$scope.config.hide) {
                     $scope.validation($scope.model);
                 } else {
@@ -784,7 +784,7 @@ formus.provider('FormusValidator', function($logProvider) {
             return null;
         }
     };
-    var getProvider = function($log) {
+    var getProvider = function($log, $injector) {
         function get(name) {
             if (validators[name]) {
                 return validators[name];
@@ -793,7 +793,11 @@ formus.provider('FormusValidator', function($logProvider) {
 
         function validate(validatorName, value, config, args) {
             if (validators[validatorName]) {
-                return validators[validatorName](value, config, args);
+                return $injector.invoke(validators[validatorName], null, {
+                    value: value,
+                    config: config,
+                    args: args
+                });
             }
             $log.warn('Don\'t find validator with name "' + validatorName + '"');
             return null;

dist/formus.js

@@ -159,7 +159,7 @@
           $scope.isValid = true;
           $scope.dirty = false;
           $scope.validation = function (value) {
-            if (_.isObject($scope.config.validators)) {
+            if (angular.isObject($scope.config.validators)) {
               $scope.errors = [];
               angular.forEach($scope.config.validators, function (args, name) {
                 var error = FormusValidator.validate(name, value, $scope.config, args);
@@ -169,7 +169,7 @@
               });
             }
           };
-          $scope.$on('Formus.validate', function () {
+          $scope.$on('Formus.validate', function (e) {
             if (!$scope.config.hide) {
               $scope.validation($scope.model);
             } else {
@@ -180,7 +180,7 @@
           });
           var init = function () {
             $scope.parentCtrl = $element.parent().controller('formus-field');
-            if (_.isUndefined($scope.parentCtrl)) {
+            if (angular.isUndefined($scope.parentCtrl)) {
               $scope.parentCtrl = $element.parent().controller('formus-form');
             }
             $scope.parentScope = $scope.parentCtrl.getScope();
@@ -203,7 +203,7 @@
                 $scope.parentScope.errors = FormusHelper.setNested($scope.parentScope.errors, $scope.config.name, newValue);
               }
             });
-            $scope.isParent = !_.isUndefined($scope.config.fields);
+            $scope.isParent = !angular.isUndefined($scope.config.fields);
             /** Set field type 'fieldset' when it has child fields and don't set other type */
             if ($scope.isParent && _.isUndefined($scope.config.input)) {
               $scope.config.input = 'fieldset';
@@ -213,7 +213,7 @@
               $element: $element,
               $attr: $attr
             });
-            if (_.isFunction($scope.config.linker)) {
+            if (angular.isFunction($scope.config.linker)) {
               $injector.invoke($scope.config.linker, this, {
                 $scope: $scope,
                 $element: $element,
@@ -312,7 +312,7 @@
             };
             $scope.submit = function () {
               $scope.validate().then(function () {
-                if (typeof $scope.config.submit.handler === 'function') {
+                if (angular.isFunction($scope.config.submit.handler)) {
                   $scope.config.submit.handler();
                 }
               }, angular.noop);
@@ -528,7 +528,7 @@
         $scope.setElementTemplate = function (templateData) {
           $element.html(templateData);
           $compile($element.contents())($scope);
-          if (typeof $scope.afterLoadTemplate === 'function') {
+          if (angular.isFunction($scope.afterLoadTemplate)) {
             $scope.afterLoadTemplate();
           }
         };
@@ -570,7 +570,7 @@
           $scope.config[name] = value;
         }
       });
-      if ($scope.config.label && typeof $scope.config.showLabel === 'undefined') {
+      if ($scope.config.label && angular.isUndefined($scope.config.showLabel)) {
         $scope.config.showLabel = true;
       }
     };
@@ -642,7 +642,7 @@
      * @param templateUrl
      */
     var setTemplateUrl = function (name, templateUrl) {
-      if (typeof name === 'string') {
+      if (angular.isString(name)) {
         templateMap[name] = templateUrl;
       } else {
         angular.forEach(name, function (templateUrl, name) {
@@ -750,15 +750,19 @@
             return null;
           }
         };
-      var getProvider = function ($log) {
+      var getProvider = function ($log, $injector) {
         function get(name) {
           if (validators[name]) {
             return validators[name];
           }
         }
         function validate(validatorName, value, config, args) {
           if (validators[validatorName]) {
-            return validators[validatorName](value, config, args);
+            return $injector.invoke(validators[validatorName], null, {
+              value: value,
+              config: config,
+              args: args
+            });
           }
           $log.warn('Don\'t find validator with name "' + validatorName + '"');
           return null;
@@ -769,7 +773,7 @@
         };
       };
       var set = function (name, callback) {
-        if (typeof callback === 'function') {
+        if (angular.isFunction(callback)) {
           validators[name] = callback;
         } else {
           $logProvider.warn('Validator must be function. Can\'t set validator with name "' + name + '"');