Fix tests

swagger_parser/swagger_parser.py

@@ -169,6 +169,9 @@ def get_example_from_prop_spec(self, prop_spec):
         # From definition
         if '$ref' in prop_spec.keys():
             return self._example_from_definition(prop_spec)
+        # Process AllOf section
+        if 'allOf' in prop_spec.keys():
+            return self._example_from_allof(prop_spec)
         # Complex type
         if 'type' not in prop_spec:
             return self._example_from_complex_def(prop_spec)
@@ -324,6 +327,22 @@ def _example_from_definition(self, prop_spec):
             example = dict((example_name, example_value) for example_name, example_value in example_dict.items())
             return example
 
+    def _example_from_allof(self, prop_spec):
+        """Get the examples from an allOf section.
+        Args:
+            prop_spec: property specification you want an example of.
+        Returns:
+            An example dict
+        """
+        example_dict = {}
+        for definition in prop_spec['allOf']:
+            update = self.get_example_from_prop_spec(definition)
+            print(update)
+            if isinstance(update, list):
+                update = update[0]
+            example_dict.update(update)
+        return example_dict
+
     def _example_from_complex_def(self, prop_spec):
         """Get an example from a property specification.
 

tests/swagger-parser/conftest.py

@@ -81,7 +81,6 @@ def get_path_data():
             'description': u'successful \xb5-\xf8per\xe4tio\xf1',
             'schema': {
                 '$ref': '#/definitions/Pet',
-                'x-scope': ['']
             }
         },
         '400': {'description': 'Invalid ID supplied'},
@@ -103,7 +102,6 @@ def post_put_path_data():
         'required': False,
         'schema': {
             '$ref': '#/definitions/Pet',
-            'x-scope': ['']
         }
     }
     pet_put = pet_post.copy()
@@ -112,7 +110,6 @@ def post_put_path_data():
         'description': 'Created',
         'schema': {
             '$ref': '#/definitions/Pet',
-            'x-scope': ['']
         }
     }
     expected_post_put_paths = {

tests/swagger-parser/test_swagger_parser.py

@@ -220,6 +220,9 @@ def test_validate_definition(swagger_parser, pet_definition_example):
 def test_get_paths_data(swagger_parser, post_put_path_data, get_path_data):
     swagger_parser.get_paths_data()
     assert len(swagger_parser.paths) == 13
+    print()
+    print(f'____________{post_put_path_data}')
+    print(f"______________{swagger_parser.paths['v2/pets']}")
     assert swagger_parser.paths['v2/pets'] == post_put_path_data
     assert swagger_parser.paths['v2/pets/{petId}']['get'] == get_path_data
     post_pet_id = swagger_parser.paths['v2/pets/{petId}']['post']['parameters']['petId']