test: fix

stoplightio · Nov 19, 2019 · 2ba9889 · 2ba9889
1 parent b6aedf0
commit 2ba9889
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Prism has values for path/query params bolded and in color [#743](https://github.com/stoplightio/prism/pull/743)
 - The CLI now displays a timestamp for all the logged operations [#779](https://github.com/stoplightio/prism/pull/779)
 - Prism has now support for OpenAPI 3.0 callbacks [#716](https://github.com/stoplightio/prism/pull/716)
+- Prism body validator will now show allowed enum parameters in error messages [#828](https://github.com/stoplightio/prism/pull/828)
 
 ## Fixed
 

diff --git a/packages/http/src/validator/validators/__tests__/__snapshots__/utils.spec.ts.snap b/packages/http/src/validator/validators/__tests__/__snapshots__/utils.spec.ts.snap
@@ -32,7 +32,7 @@ exports[`convertAjvErrors() message field is missing converts properly 1`] = `
 Array [
   Object {
     "code": "required",
-    "message": "undefined",
+    "message": "",
     "path": Array [
       "b",
     ],

diff --git a/packages/http/src/validator/validators/utils.ts b/packages/http/src/validator/validators/utils.ts
@@ -21,7 +21,7 @@ export const convertAjvErrors = (errors: Ajv.ErrorObject[] | undefined | null, s
     return {
       path: error.dataPath.split('.').slice(1),
       code: error.keyword || '',
-      message: `${error.message}${allowedParameters}` || '',
+      message: `${error.message || ''}${allowedParameters || ''}`,
       severity,
     };
   });

diff --git a/test-harness/specs/validate-body-params/form-data-invalid-request.oas2.txt b/test-harness/specs/validate-body-params/form-data-invalid-request.oas2.txt
@@ -33,4 +33,4 @@ HTTP/1.1 422 Unprocessable Entity
 content-type: application/problem+json
 Connection: keep-alive
 
-{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values"}]}
+{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values: open, close"}]}
diff --git a/test-harness/specs/validate-body-params/form-data-invalid-request.oas3.txt b/test-harness/specs/validate-body-params/form-data-invalid-request.oas3.txt
@@ -36,4 +36,4 @@ HTTP/1.1 422 Unprocessable Entity
 content-type: application/problem+json
 Connection: keep-alive
 
-{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values"}]}
+{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values: open, close"}]}
diff --git a/test-harness/specs/validate-body-params/json-invalid-request-2.oas2.txt b/test-harness/specs/validate-body-params/json-invalid-request-2.oas2.txt
@@ -35,4 +35,4 @@ HTTP/1.1 422 Unprocessable Entity
 content-type: application/problem+json
 Connection: keep-alive
 
-{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values"}]}
+{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values: open, close"}]}
diff --git a/test-harness/specs/validate-body-params/json-invalid-request-2.oas3.txt b/test-harness/specs/validate-body-params/json-invalid-request-2.oas3.txt
@@ -34,4 +34,4 @@ HTTP/1.1 422 Unprocessable Entity
 content-type: application/problem+json
 Connection: keep-alive
 
-{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values"}]}
+{"type":"https://stoplight.io/prism/errors#UNPROCESSABLE_ENTITY","title":"Invalid request body payload","status":422,"detail":"Your request is not valid and no HTTP validation response was found in the spec, so Prism is generating this error for you.","validation":[{"location":["body"],"severity":"Error","code":"required","message":"should have required property 'id'"},{"location":["body","status"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values: open, close"}]}
diff --git a/test-harness/specs/violations/value-not-in-enum.httpResponse.txt b/test-harness/specs/violations/value-not-in-enum.httpResponse.txt
@@ -30,4 +30,4 @@ curl -i http://localhost:4010/path
 ====expect====
 HTTP/1.1 500 Internal Server Error
 
-{"type":"https://stoplight.io/prism/errors#VIOLATIONS","title":"Request/Response not valid","status":500,"detail":"Your request/response is not valid and the --errors flag is set, so Prism is generating this error for you.","validation":[{"location":["response","body"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values"}]}
+{"type":"https://stoplight.io/prism/errors#VIOLATIONS","title":"Request/Response not valid","status":500,"detail":"Your request/response is not valid and the --errors flag is set, so Prism is generating this error for you.","validation":[{"location":["response","body"],"severity":"Error","code":"enum","message":"should be equal to one of the allowed values: placed, approved, delivered"}]}