Revert "Merge pull request #138 from Yelp/fix-additionalproperties-bo…

…ol-validation" This reverts commit ab34510, reversing changes made to fcc7604.
Yelp · Jun 22, 2020 · ff186cc · ff186cc
1 parent 95d651a
commit ff186cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/swagger_spec_validator/validator20.py b/swagger_spec_validator/validator20.py
@@ -512,13 +512,12 @@ def validate_definition(definition, deref, def_name=None, visited_definitions_id
             )
 
     if 'additionalProperties' in definition:
-        if definition.get('additionalProperties') not in (True, False):
-            validate_definition(
-                definition=definition.get('additionalProperties'),
-                deref=deref,
-                def_name='{}/additionalProperties'.format(def_name),
-                visited_definitions_ids=visited_definitions_ids,
-            )
+        validate_definition(
+            definition=definition.get('additionalProperties'),
+            deref=deref,
+            def_name='{}/{}'.format(def_name, 'additionalProperties'),
+            visited_definitions_ids=visited_definitions_ids,
+        )
 
     if 'discriminator' in definition:
         required_props, not_required_props = get_collapsed_properties_type_mappings(definition, deref)

diff --git a/tests/validator20/validate_spec_test.py b/tests/validator20/validate_spec_test.py
@@ -427,6 +427,8 @@ def test_highlight_inconsistent_schema_object_validation(minimal_swagger_dict, s
 
 def test_additional_properties_validated(minimal_swagger_dict, default_checks_spec_dict):
     invalid_spec = {'type': 'object', 'required': ['foo']}
+    minimal_swagger_dict['definitions']['injected_definition'] = invalid_spec
+
     minimal_swagger_dict['definitions']['injected_definition'] = {
         'type': 'object', 'additionalProperties': invalid_spec
     }
@@ -435,16 +437,10 @@ def test_additional_properties_validated(minimal_swagger_dict, default_checks_sp
         validate_spec(minimal_swagger_dict)
 
 
-def test_additional_properties_bool(minimal_swagger_dict, default_checks_spec_dict):
-    minimal_swagger_dict['definitions']['injected_definition'] = {
-        'type': 'object', 'additionalProperties': False,
-    }
-
-    validate_spec(minimal_swagger_dict)
-
-
 def test_array_items_validated(minimal_swagger_dict, default_checks_spec_dict):
     invalid_spec = {'type': 'object', 'required': ['foo']}
+    minimal_swagger_dict['definitions']['injected_definition'] = invalid_spec
+
     minimal_swagger_dict['definitions']['injected_definition'] = {
         'type': 'array', 'items': invalid_spec
     }