working on field validation

Author: matt-sanders

src/components/FormlyField.vue

@@ -38,7 +38,7 @@
 
          let validator = this.field.validators[validKey];
 
-         let valid = typeof validator == 'function' ? !validator(field) : !eval(validator);
+         let valid = typeof validator == 'function' ? !validator(field, model) : !eval(validator);
          setError(this.form, this.field.key, validKey, valid);
          
        });

test/unit/specs/FormlyField.spec.js

@@ -161,64 +161,69 @@ describe('FormlyField', () => {
         done();
       },0);
     });
-    
-  });
-
-  /*
 
     it('should not require non-required values', (done) => {
       let data = {
         form: {
           $valid: true,
-          $errors: {},
-          search: {
+          $errors: {}
+        },
+        model: {
+          search: ''
+        },
+        fields: [
+          {
+            key: 'search',
             type: 'test',
-            value: '',
             validators: {
               expression: 'field.value == "test"'
             }
           }
-        }
+        ]
       };
 
       createValidField(data);
       expect(vm.form.$errors.search.expression).to.be.false;
 
-      vm.$set('form.search.value', 'testing');
+      vm.model.search = 'testing';
       setTimeout(()=>{
         expect(vm.form.$errors.search.expression).to.be.true;
         done();
       },0);
-    });
+    });  
 
     it('should take a function', (done) => {
       let data = {
         form: {
           $valid: true,
-          $errors: {},
-          search: {
+          $errors: {}
+        },
+        model: {
+          search: 'testing'
+        },
+        fields: [
+          {
+            key: 'search',
             type: 'test',
-            value: 'testing',
             validators: {
-              expression: function(field){
-                return field.value == 'test';
+              expression: function(field, model){
+                return model.search == 'test';
               }
             }
           }
-        }
+        ]
       };
 
       createValidField(data);
       expect(vm.form.$errors.search.expression).to.be.true;
-
-      vm.$set('form.search.value', 'test');
+      vm.model.search = 'test';
       setTimeout(()=>{
         expect(vm.form.$errors.search.expression).to.be.false;
         done();
       },0);
     });
 
   });
-  */    
+   
 });