further simplified tests in web

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/openapi_specs.py

@@ -6,12 +6,19 @@
 from copy import deepcopy
 from functools import lru_cache
 from pathlib import Path
-from typing import Any, NamedTuple
+from typing import Any, Callable, NamedTuple
 
 import jsonref
 import pytest
 import yaml
 
+try:
+    from aiohttp import web
+
+    has_aiohttp = True
+except ImportError:
+    has_aiohttp = False
+
 
 class Entrypoint(NamedTuple):
     name: str
@@ -64,3 +71,35 @@ def openapi_specs_entrypoints(
                 )
             )
     return entrypoints
+
+
+if has_aiohttp:
+
+    @pytest.fixture
+    def create_aiohttp_app_rest_entrypoints() -> Callable[
+        [web.Application], set[Entrypoint]
+    ]:
+        def _(app: web.Application):
+            entrypoints: set[Entrypoint] = set()
+
+            # app routes, i.e. "exposed"
+            for resource_name, resource in app.router.named_resources().items():
+                resource_path = resource.canonical
+                for route in resource:
+                    assert route.name == resource_name
+                    assert route.resource
+                    assert route.name is not None
+
+                    if route.method == "HEAD":
+                        continue
+
+                    entrypoints.add(
+                        Entrypoint(
+                            method=route.method,
+                            path=resource_path,
+                            name=route.name,
+                        )
+                    )
+            return entrypoints
+
+        return _

services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py

@@ -4,6 +4,8 @@
 # pylint: disable=unused-variable
 
 
+from collections.abc import Callable
+
 import pytest
 from aiohttp import web
 from faker import Faker
@@ -53,36 +55,13 @@ def app(app_environment: EnvVarsDict) -> web.Application:
     return app_
 
 
-@pytest.fixture
-def app_rest_entrypoints(app: web.Application) -> set[Entrypoint]:
-    entrypoints: set[Entrypoint] = set()
-
-    # app routes, i.e. "exposed"
-    for resource_name, resource in app.router.named_resources().items():
-        resource_path = resource.canonical
-        for route in resource:
-            assert route.name == resource_name
-            assert route.resource
-            assert route.name is not None
-
-            if route.method == "HEAD":
-                continue
-
-            entrypoints.add(
-                Entrypoint(
-                    method=route.method,
-                    path=resource_path,
-                    name=route.name,
-                )
-            )
-    return entrypoints
-
-
 def test_app_named_resources_against_openapi_specs(
     openapi_specs_entrypoints: set[Entrypoint],
-    app_rest_entrypoints: set[Entrypoint],
+    app: web.Application,
+    create_aiohttp_app_rest_entrypoints: Callable[[web.Application], set[Entrypoint]],
 ):
     # check whether exposed routes implements openapi.json contract
+    app_rest_entrypoints: set[Entrypoint] = create_aiohttp_app_rest_entrypoints(app)
 
     assert app_rest_entrypoints == openapi_specs_entrypoints