Skip to content

Commit

Permalink
Cleanup tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsbox committed Dec 7, 2023
1 parent 65e7392 commit 3e4f12a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 29 deletions.
12 changes: 12 additions & 0 deletions tests/api/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import pytest
from connexion.middleware import MiddlewarePosition
from starlette.middleware.cors import CORSMiddleware
from connexion.options import SwaggerUIOptions
from starlette.types import Receive, Scope, Send

from conftest import OPENAPI3_SPEC, build_app_from_fixture
Expand All @@ -22,6 +23,17 @@ def simple_openapi_app(app_class):
)


@pytest.fixture(scope="session")
def swagger_app(spec, app_class):
return build_app_from_fixture(
"simple",
app_class=app_class,
spec_file=spec,
validate_responses=True,
swagger_ui_options=SwaggerUIOptions(spec_path="/spec.json"),
)


@pytest.fixture(scope="session")
def cors_openapi_app(app_class):
app = build_app_from_fixture(
Expand Down
33 changes: 4 additions & 29 deletions tests/api/test_swagger_ui.py
Original file line number Diff line number Diff line change
@@ -1,31 +1,6 @@
from connexion.middleware.swagger_ui import SwaggerUIConfig


def test_simple(simple_app):
app_client = simple_app.test_client()
for api in simple_app.middleware.apis:
if api.kwargs['swagger_ui_options']:
swagger_ui_options = api.kwargs['swagger_ui_options']
else:
swagger_ui_options = simple_app.middleware.options.swagger_ui_options

options = SwaggerUIConfig(
swagger_ui_options, oas_version=api.specification.version
)
response = app_client.get(api.specification.base_path+options.openapi_spec_path)
assert response.status_code == 200


def test_simple_openapi(simple_openapi_app):
app_client = simple_openapi_app.test_client()
for api in simple_openapi_app.middleware.apis:
if api.kwargs['swagger_ui_options']:
swagger_ui_options = api.kwargs['swagger_ui_options']
else:
swagger_ui_options = simple_openapi_app.middleware.options.swagger_ui_options

options = SwaggerUIConfig(
swagger_ui_options, oas_version=api.specification.version
)
response = app_client.get(api.specification.base_path+options.openapi_spec_path)
def test_simple(swagger_app):
app_client = swagger_app.test_client()
for api in swagger_app.middleware.apis:
response = app_client.get(api.specification.base_path+"/spec.json")
assert response.status_code == 200

0 comments on commit 3e4f12a

Please sign in to comment.