Fix openapi >=3 versions compatibility

0b01001001 · Dec 10, 2020 · 0ab3477 · 0ab3477
1 parent 6226af2
commit 0ab3477
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/spectree/spec.py b/spectree/spec.py
@@ -157,12 +157,12 @@ async def async_validate(*args, **kwargs):
             ):
                 if model is not None:
                     assert issubclass(model, BaseModel)
-                    self.models[model.__name__] = model.schema()
+                    self.models[model.__name__] = model.schema(ref_template="#/components/schemas/{model}")
                     setattr(validation, name, model.__name__)
 
             if resp:
                 for model in resp.models:
-                    self.models[model.__name__] = model.schema()
+                    self.models[model.__name__] = model.schema(ref_template="#/components/schemas/{model}")
                 validation.resp = resp
 
             if tags:
@@ -214,8 +214,7 @@ def _generate_spec(self):
             },
             "tags": list(tags.values()),
             "paths": {**routes},
-            "components": {"schemas": {**self.models}},
-            "definitions": self._get_model_definitions(),
+            "components": {"schemas": {**self.models, **self._get_model_definitions()}},
         }
         return spec
 

diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -8,7 +8,7 @@
 
 @pytest.mark.parametrize("api", [flask_api, falcon_api, starlette_api])
 def test_plugin_spec(api):
-    models = {m.__name__: m.schema() for m in (Query, JSON, Resp, Cookies, Headers)}
+    models = {m.__name__: m.schema(ref_template="#/components/schemas/{model}") for m in (Query, JSON, Resp, Cookies, Headers)}
     for name, schema in models.items():
         assert api.spec["components"]["schemas"][name] == schema
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -93,7 +93,7 @@ def test_parse_request():
 
 
 def test_parse_params():
-    models = {"DemoModel": DemoModel.schema()}
+    models = {"DemoModel": DemoModel.schema(ref_template="#/components/schemas/{model}")}
     assert parse_params(demo_func, [], models) == []
     params = parse_params(demo_class.demo_method, [], models)
     assert len(params) == 3