More detailed allOf fail message

hh-h · Mar 24, 2021 · 10e9520 · 10e9520 · eLvErDe · Mar 25, 2021
1 parent d601163
commit 10e9520
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.5.4 (dd-mm-yyyy)
+------------------
+
+- detailed error info for allOf
+
 0.5.3 (14-01-2021)
 ------------------
 

diff --git a/aiohttp_swagger3/validators.py b/aiohttp_swagger3/validators.py
@@ -457,10 +457,7 @@ def validate(self, raw_value: Any, raw: bool) -> Any:
 
         value: Dict = {}
         for validator in self.validators:
-            try:
-                value.update(validator.validate(raw_value, raw))
-            except ValidatorError:
-                raise ValidatorError("fail to validate allOf")
+            value.update(validator.validate(raw_value, raw))
         return value
 
 

diff --git a/tests/test_docs_request_bodies.py b/tests/test_docs_request_bodies.py
@@ -786,37 +786,37 @@ async def handler(request, body: Dict):
     resp = await client.post("/r", json=body)
     assert resp.status == 400
     error = error_to_json(await resp.text())
-    assert error == {"body": {"object": "fail to validate allOf"}}
+    assert error == {"body": {"object": {"name": "required property"}}}
 
     body = {"object": {"name": "string"}}
     resp = await client.post("/r", json=body)
     assert resp.status == 400
     error = error_to_json(await resp.text())
-    assert error == {"body": {"object": "fail to validate allOf"}}
+    assert error == {"body": {"object": {"id": "required property"}}}
 
     body = {"object": {"test": "value"}}
     resp = await client.post("/r", json=body)
     assert resp.status == 400
     error = error_to_json(await resp.text())
-    assert error == {"body": {"object": "fail to validate allOf"}}
+    assert error == {"body": {"object": {"id": "required property"}}}
 
     body = {"object": {"id": 10, "name": "string", "age": 10.1}}
     resp = await client.post("/r", json=body)
     assert resp.status == 400
     error = error_to_json(await resp.text())
-    assert error == {"body": {"object": "fail to validate allOf"}}
+    assert error == {"body": {"object": {"age": "value should be type of int"}}}
 
     body = {"object": {"rank": "321"}}
     resp = await client.post("/r", json=body)
     assert resp.status == 400
     error = error_to_json(await resp.text())
-    assert error == {"body": {"object": "fail to validate allOf"}}
+    assert error == {"body": {"object": {"id": "required property"}}}
 
     body = {"object": {"age": 15}}
     resp = await client.post("/r", json=body)
     assert resp.status == 400
     error = error_to_json(await resp.text())
-    assert error == {"body": {"object": "fail to validate allOf"}}
+    assert error == {"body": {"object": {"id": "required property"}}}
 
 
 async def test_array_in_object(swagger_docs, aiohttp_client):