Merge pull request #173 from AbdealiJK/ajk-code

apidoc: Add default_in=None by default

Author: sloria

flask_apispec/apidoc.py

@@ -94,7 +94,7 @@ def get_parameters(self, rule, view, docs, parent=None):
             locations = options.pop('locations', None)
             if locations:
                 options['default_in'] = locations[0]
-            else:
+            elif 'default_in' not in options:
                 options['default_in'] = 'body'
             extra_params += converter(schema, **options) if args else []
 

tests/test_openapi.py

@@ -245,7 +245,7 @@ def test_params(self, app, path):
         assert params == expected
 
 
-class TestFiledsNoLocationProvided:
+class TestGetFieldsNoLocationProvided:
 
     @pytest.fixture
     def function_view(self, app):
@@ -266,26 +266,19 @@ def path(self, app, spec, function_view):
 
     def test_params(self, app, path):
         params = path['get']['parameters']
-        rule = app.url_map._rules_by_endpoint['get_band'][0]
-        expected = (
-                [{
-                    'in': 'body',
-                    'name': 'body',
-                    'required': False,
-                    'schema': {
-                        'properties': {
-                            'address': {
-                                'type': 'string'
-                            },
-                            'name': {
-                                'type': 'string'
-                            }
-                        },
-                        'type': 'object'
-                    },
-                }] + rule_to_params(rule)
-        )
-        assert params == expected
+        assert {
+            'in': 'body',
+            'name': 'body',
+            'required': False,
+            'schema': {
+                'properties': {
+                    'address': {'type': 'string'},
+                    'name': {'type': 'string'},
+                },
+                'type': 'object',
+            },
+        } in params
+
 
 class TestSchemaNoLocationProvided:
 
@@ -310,13 +303,5 @@ def path(self, app, spec, function_view):
 
     def test_params(self, app, path):
         params = path['get']['parameters']
-        rule = app.url_map._rules_by_endpoint['get_band'][0]
-        expected = (
-                [{
-                    'in': 'body',
-                    'name': 'body',
-                    'required': False,
-                    'schema': {'$ref': '#/definitions/Body'}
-                }] + rule_to_params(rule)
-        )
-        assert params == expected
+        assert {'name': 'body', 'in': 'body', 'required': False,
+                'schema': {'$ref': '#/definitions/Body'}} in params