fix(quart): add check for PREFER_SECURE_URLS for quart 0.10.0 (#30)

* fix(quart): add check for PREFER_SECURE_URLS for quart 0.10.0

* fix(req_ctx): use proper args to test_req_ctx for quart version

* add "packaging" dep for tests

Author: Matt Topol

quart_openapi/__about__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 __short_version__ = '1.4'
-__release__ = '1.4.3'
+__release__ = '1.4.4'
 __description__ = 'Framework for Quart to add swagger generation to routes and restful resources'

quart_openapi/swagger.py

@@ -124,13 +124,14 @@ def as_dict(self) -> Dict[str, Any]:
         for resource, path, methods in self.api.resources:
             paths[extract_path(path)] = self.serialize_resource(resource, path, methods)
 
+        scheme = self.api.config.get('PREFERRED_URL_SCHEME',
+            'http' if not self.api.config.get('PREFER_SECURE_URLS', False) else 'https')
         spec = {
             'openapi': '3.0.0',
             'info': infos,
             'servers': [
                 {
-                    'url': ''.join([self.api.config['PREFERRED_URL_SCHEME'], '://',
-                                    self.api.config['SERVER_NAME'] or ''])
+                    'url': ''.join([scheme, '://', self.api.config['SERVER_NAME'] or ''])
                 }
             ],
             'paths': paths,

requirements/test.pip

@@ -1,2 +1,3 @@
 pytest >= 3.6.3
-pytest-asyncio
+pytest-asyncio
+packaging

tests/test_blueprints.py

@@ -1,9 +1,19 @@
 import pytest
+from packaging import version
 from http import HTTPStatus
 from quart_openapi import Pint, Resource, PintBlueprint
 from quart import Blueprint, url_for, request, ResponseReturnValue, abort
+from quart.__about__ import __version__ as quart_version
 from quart.views import MethodView
 
+QUART_VER_GT_09 = version.parse(quart_version) >= version.parse('0.9.0')
+
+def req_ctx(app: Pint, page: str, method: str=''):
+    if QUART_VER_GT_09:
+        return app.test_request_context(page, method=method)
+    else:
+        return app.test_request_context(method, page)
+
 @pytest.mark.asyncio
 async def test_root_endpoint_blueprint(app: Pint) -> None:
     blueprint = Blueprint('blueprint', __name__)
@@ -13,7 +23,7 @@ async def route() -> ResponseReturnValue:
         return 'OK'
 
     app.register_blueprint(blueprint)
-    async with app.test_request_context('GET', '/page/'):
+    async with req_ctx(app, '/page/', method='GET'):
         assert request.blueprint == 'blueprint'
         assert '/page/' == url_for('blueprint.route')
 
@@ -31,18 +41,18 @@ async def route() -> ResponseReturnValue:
     app.register_blueprint(blueprint, url_prefix='/blueprint')
     app.register_blueprint(prefix)
 
-    async with app.test_request_context('GET', '/'):
+    async with req_ctx(app, '/', method='GET'):
         assert '/page/' == url_for('route')
         assert '/prefix/page/' == url_for('prefix.route')
         assert '/blueprint/page/' == url_for('blueprint.route')
 
-    async with app.test_request_context('GET', '/page/'):
+    async with req_ctx(app, '/page/', method='GET'):
         assert request.blueprint is None
 
-    async with app.test_request_context('GET', '/prefix/page/'):
+    async with req_ctx(app, '/prefix/page/', method='GET'):
         assert request.blueprint == 'prefix'
 
-    async with app.test_request_context('GET', '/blueprint/page/'):
+    async with req_ctx(app, '/blueprint/page/', method='GET'):
         assert request.blueprint == 'blueprint'
 
 
@@ -90,7 +100,7 @@ async def test_pint_blueprint_openapi(app: Pint) -> None:
     blueprint = PintBlueprint('blueprint', __name__, url_prefix='/blueprint')
     app.register_blueprint(blueprint)
 
-    async with app.test_request_context('GET', '/'):
+    async with req_ctx(app, '/', method='GET'):
         assert '/openapi.json' == url_for('openapi')
 
 

tests/test_routing.py

@@ -1,9 +1,19 @@
 import pytest
+from packaging import version
 from quart_openapi import Pint, Resource
 from jsonschema import RefResolver
 from quart import request, jsonify, url_for
+from quart.__about__ import __version__ as quart_version
 from http import HTTPStatus
 
+QUART_VER_GT_09 = version.parse(quart_version) >= version.parse('0.9.0')
+
+def req_ctx(app: Pint, page: str, method: str=''):
+    if QUART_VER_GT_09:
+        return app.test_request_context(page, method=method)
+    else:
+        return app.test_request_context(method, page)
+
 @pytest.mark.asyncio
 async def test_simple_app(app):
     @app.route('/statusCheck')
@@ -46,7 +56,7 @@ class Tester(Resource):
         async def get(self):
             return 'Got'
 
-    async with app.test_request_context('GET', '/'):
+    async with req_ctx(app, '/', method='GET'):
         openapi_url = url_for('openapi')
         route_url = url_for('tester')
         assert '/openapi.json' == openapi_url