ref: General refactoring

Author: javiertrancoso

package.json

@@ -14,7 +14,6 @@
   },
   "devDependencies": {
     "chai": "4.2.0",
-    "chai-as-promised": "7.1.1",
     "cross-env": "6.0.3",
     "mocha": "6.1.4",
     "mocha-junit-reporter": "1.22.0",

src/utils/validation-errors-converter.js

@@ -8,6 +8,7 @@ function convertValidationError(error) {
   const params = errorObject.params
 
   switch(errorObject.keyword) {
+    // TODO Create different error messages for objects and strings #4
     case 'type':
       return new SchemaValidatorError(`Property '${propName}' must be ${params.type}.`, errorObject.dataPath, errorObject.data)
     case 'additionalProperties':

test/test_unit/validation-errors-converter.test.js

@@ -6,14 +6,19 @@ describe('validation-error-converter test', () => {
     it('type', () => {
         const schema = {
             $id: 'http://example.com/schemas/schema.json',
-            type: 'object'
+            type: 'object',
+            properties: {
+                typeError: {
+                    type: 'object'
+                }
+            }
         }
         const schemaValidator = new SchemaValidator(schema.$id, [schema])
 
-        const result = schemaValidator.validate.bind(schemaValidator, 'invalid-type')
+        const result = schemaValidator.validate.bind(schemaValidator, {typeError: 'invalid-type'})
         expect(result).to.throw().to.include({
-            field: '',
-            message: "Property '' must be object.",
+            field: '.typeError',
+            message: "Property 'typeError' must be object.",
             rejected_value: 'invalid-type'
         })
     })
@@ -43,54 +48,69 @@ describe('validation-error-converter test', () => {
             $id: 'http://example.com/schemas/schema.json',
             type: 'object',
             additionalProperties: false,
-            required: ['requiredProperty'],
             properties: {
-                requiredProperty: {
-                    type: 'string'
+                requiredError: {
+                    type: 'object',
+                    required: ['requiredProperty'],
+                    properties: {
+                        requiredProperty: {
+                            type: 'string'
+                        }
+                    }
                 }
             }
         }
         const schemaValidator = new SchemaValidator(schema.$id, [schema])
 
-        const result = schemaValidator.validate.bind(schemaValidator, {})
+        const result = schemaValidator.validate.bind(schemaValidator, {requiredError: {}})
         expect(result).to.throw().to.include({
-            field: '.',
+            field: '.requiredError',
             message: "Missing property 'requiredProperty'."
         })
     })
 
     it('const', () => {
         const schema = {
             $id: 'http://example.com/schemas/schema.json',
-            type: 'string',
-            const: 'valid_value'
+            type: 'object',
+            properties: {
+                constError: {
+                    type: 'string',
+                    const: 'valid_value'
+                }
+            }
         }
         const schemaValidator = new SchemaValidator(schema.$id, [schema])
 
-        const result = schemaValidator.validate.bind(schemaValidator, 'invalid_value')
+        const result = schemaValidator.validate.bind(schemaValidator, {constError: 'invalid_value'})
         expect(result).to.throw().to.include({
-            field: '',
-            message: "Property '' must have value 'valid_value'.",
+            field: '.constError',
+            message: "Property 'constError' must have value 'valid_value'.",
             rejected_value: 'invalid_value'
         })
     })
 
     it('enum - values', () => {
         const schema = {
             $id: 'http://example.com/schemas/schema.json',
-            type: 'string',
-            enum: [
-                'valid-1',
-                'valid-2',
-                'valid-3'
-            ]
+            type: 'object',
+            properties: {
+                enumError: {
+                    type: 'string',
+                    enum: [
+                        'valid-1',
+                        'valid-2',
+                        'valid-3'
+                    ]
+                }
+            }
         }
         const schemaValidator = new SchemaValidator(schema.$id, [schema])
 
-        const result = schemaValidator.validate.bind(schemaValidator, 'invalid')
+        const result = schemaValidator.validate.bind(schemaValidator, {enumError: 'invalid'})
         expect(result).to.throw().to.include({
-            field: '',
-            message: "Property '' with value 'invalid' does not match any allowed value: valid-1, valid-2, valid-3.",
+            field: '.enumError',
+            message: "Property 'enumError' with value 'invalid' does not match any allowed value: valid-1, valid-2, valid-3.",
             rejected_value: 'invalid'
         })
     })
@@ -120,31 +140,41 @@ describe('validation-error-converter test', () => {
     it('format URL', () => {
         const schema = {
             $id: 'http://example.com/schemas/schema.json',
-            type: 'string',
-            format: 'httpUrl'
+            type: 'object',
+            properties: {
+                formatError: {
+                    type: 'string',
+                    format: 'httpUrl'
+                }
+            }
         }
         const schemaValidator = new SchemaValidator(schema.$id, [schema])
 
-        const result = schemaValidator.validate.bind(schemaValidator, 'invalid-url')
+        const result = schemaValidator.validate.bind(schemaValidator, {formatError: 'invalid-url'})
         expect(result).to.throw().to.include({
-            field: '',
-            message: `Property '' must be a valid URL. Current value is "invalid-url"`,
+            field: '.formatError',
+            message: `Property 'formatError' must be a valid URL. Current value is "invalid-url"`,
             rejected_value: 'invalid-url'
         })
     })
 
     it('format other', () => {
         const schema = {
             $id: 'http://example.com/schemas/schema.json',
-            type: 'string',
-            format: 'email'
+            type: 'object',
+            properties: {
+                formatError: {
+                    type: 'string',
+                    format: 'email'
+                }
+            }
         }
         const schemaValidator = new SchemaValidator(schema.$id, [schema])
 
-        const result = schemaValidator.validate.bind(schemaValidator, 'invalid-email')
+        const result = schemaValidator.validate.bind(schemaValidator, {formatError: 'invalid-email'})
         expect(result).to.throw().to.include({
-            field: '',
-            message: `Property '' should match format "email"`,
+            field: '.formatError',
+            message: `Property 'formatError' should match format "email"`,
             rejected_value: 'invalid-email'
         })
     })