Custom validators allow to define a function that will calculate an e…

…rror message during validation
rstgroup · Oct 15, 2018 · 3d12bbf · 3d12bbf
1 parent 9e50969
commit 3d12bbf
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/Schema.js b/src/Schema.js
@@ -148,12 +148,16 @@ class Schema {
             this.errors[key] = [];
         }
 
+        const errorMessage = typeof error === 'function' ?
+            error() :
+            error;
+
         if (index > -1) {
-            this.errors[key][index] = mergeErrors(this.errors[key][index], error);
+            this.errors[key][index] = mergeErrors(this.errors[key][index], errorMessage);
             return;
         }
 
-        this.errors[key].push(error);
+        this.errors[key].push(errorMessage);
     }
 
     setModelError(path, message) {

diff --git a/src/Schema.test.js b/src/Schema.test.js
@@ -859,6 +859,7 @@ describe('Schema', () => {
             expect(Object.keys(modelWithNumberErrors).length).toBe(7);
         });
     });
+
     describe('Should validate using custom validators', () => {
         jest.useFakeTimers();
 
@@ -898,7 +899,6 @@ describe('Schema', () => {
             expect(Object.keys(testObject2Errors).length).toBe(1);
         });
 
-
         it('async with promise (1 error)', () => {
             const asyncValidator = () => ({
                 validator(value) {
@@ -990,6 +990,29 @@ describe('Schema', () => {
             const results = schema.validate({ foo: 'foo' });
             expect(results.foo).toEqual([errorMessage]);
         });
+
+        it('should allow to define a validator errorMessage as a function that will return an error diring validation', () => {
+            const customErrorMessage = 'error';
+            const customValidator = {
+                validator: () => false,
+                errorMessage: () => customErrorMessage,
+            };
+
+            const schema = new Schema({
+                property: {
+                    type: String,
+                    validators: [customValidator],
+                },
+            });
+
+            const testObject = {
+                property: 'value',
+            };
+
+            expect(schema.validate(testObject)).toEqual({
+                property: [customErrorMessage],
+            });
+        });
     });
 
     describe('Default value', () => {
@@ -1522,6 +1545,7 @@ describe('Schema', () => {
             expect(schema.getDefaultValues()).toEqual({ foo: 'foo', bar: '' });
         });
     });
+
     describe('additionalValidators', () => {
         it('should add additional validator', () => {
             const fooValidator = jest.fn();
@@ -1530,13 +1554,15 @@ describe('Schema', () => {
             schema.addValidator(fooValidator);
             expect(schema.additionalValidators.size).toEqual(1);
         });
+
         it('should not add the validator if is not a function', () => {
             const fooValidator = 'foo';
             const schema = new Schema({});
 
             schema.addValidator(fooValidator);
             expect(schema.additionalValidators.size).toEqual(0);
         });
+
         it('should remove additional validator', () => {
             const fooValidator = jest.fn();
             const schema = new Schema({});
@@ -1545,6 +1571,7 @@ describe('Schema', () => {
             schema.removeValidator(fooValidator);
             expect(schema.additionalValidators.size).toEqual(0);
         });
+
         it('should set error on field in first layer of model', () => {
             const modelSchema = new Schema({
                 foo: {
@@ -1562,6 +1589,7 @@ describe('Schema', () => {
 
             expect(modelSchema.validate(data)).toEqual({ foo: ['foo error message!'] });
         });
+
         it('should set error on field in second layer of model', () => {
             const fooSchema = new Schema({
                 fooStart: {
@@ -1592,6 +1620,7 @@ describe('Schema', () => {
                 ],
             });
         });
+
         it('should set error on field in third layer of model', () => {
             const fooBarSchema = new Schema({
                 bar1: {
@@ -1635,6 +1664,7 @@ describe('Schema', () => {
                 ],
             });
         });
+
         it('should set error on field in third layer of model in specific element in array', () => {
             const fooBarSchema = new Schema({
                 bar1: {
@@ -1685,6 +1715,7 @@ describe('Schema', () => {
                 ],
             });
         });
+
         it('should merge errors if error is set on the same key and index', () => {
             const unitSchema = new Schema({
                 value: {
@@ -1811,6 +1842,7 @@ describe('Schema', () => {
                 ],
             });
         });
+
         it('should set error on field (async validation)', () => {
             const fooSchema = new Schema({
                 fooStart: {