Merge pull request #429 from apiaryio/428-typeof-null

Returns expected type "null" when given null actual data type

Author: artem-zakharchenko

lib/validators/json-schema-next.js

@@ -244,9 +244,9 @@ class JsonSchemaValidator {
 
     switch (keyword) {
       case 'type':
-        return `At '${pointer}' Invalid type: ${typeof data} (expected ${
-          params.type
-        })`;
+        return `At '${pointer}' Invalid type: ${
+          data === null ? null : typeof data
+        } (expected ${params.type})`;
 
       case 'required':
         return `At '${pointer}' Missing required property: ${last(property)}`;

test/unit/units/validateBody.test.js

@@ -353,6 +353,45 @@ describe('validateBody', () => {
             });
           });
         });
+
+        describe('with non-matching body types', () => {
+          const result = validateBody(
+            {
+              bodySchema: {
+                properties: {
+                  firstName: {
+                    type: 'string'
+                  }
+                }
+              }
+            },
+            {
+              body: '{ "firstName": null }'
+            }
+          );
+
+          it('marks field as invalid', () => {
+            expect(result).to.not.be.valid;
+          });
+
+          it('has "json" kind', () => {
+            expect(result).to.have.kind('json');
+          });
+
+          describe('produces an error', () => {
+            it('exactly one error', () => {
+              expect(result).to.have.errors.lengthOf(1);
+            });
+
+            it('has explanatory message', () => {
+              expect(result)
+                .to.have.errorAtIndex(0)
+                .withMessage(
+                  `At '/firstName' Invalid type: null (expected string)`
+                );
+            });
+          });
+        });
       });
     });
   });

test/unit/validators/json-schema.test.js

@@ -109,8 +109,6 @@ describe('JsonSchema', () => {
           });
         });
       });
-
-      // shared.shouldBehaveLikeAmandaToGavel(new JsonSchemaValidator('{}'));
     });
 
     describe('when validation performed on actual empty object', () => {