1.2.0 tests, cleanup, formatting

Author: BarnabasG

example/conftest.py

@@ -9,7 +9,7 @@
 @pytest.fixture
 def client():
     """Standard FastAPI test client fixture.
-    
+
     The pytest-api-cov plugin will automatically discover this fixture,
     extract the app from it, and wrap it with coverage tracking.
     """

src/pytest_api_cov/cli.py

@@ -2,8 +2,6 @@
 
 import argparse
 import sys
-from pathlib import Path
-from typing import Optional, Tuple
 
 
 def generate_conftest_content(framework: str, file_path: str, app_variable: str) -> str:

src/pytest_api_cov/config.py

@@ -21,7 +21,9 @@ class ApiCoverageReportConfig(BaseModel):
     report_path: Optional[str] = Field(None, alias="api-cov-report-path")
     force_sugar: bool = Field(default=False, alias="api-cov-force-sugar")
     force_sugar_disabled: bool = Field(default=False, alias="api-cov-force-sugar-disabled")
-    client_fixture_names: List[str] = Field(["client", "test_client", "api_client", "app_client"], alias="api-cov-client-fixture-names")
+    client_fixture_names: List[str] = Field(
+        ["client", "test_client", "api_client", "app_client"], alias="api-cov-client-fixture-names"
+    )
     group_methods_by_endpoint: bool = Field(default=False, alias="api-cov-group-methods-by-endpoint")
 
 

src/pytest_api_cov/plugin.py

@@ -1,7 +1,7 @@
 """pytest plugin for API coverage tracking."""
 
 import logging
-from typing import Any, Optional
+from typing import Any, Optional, Tuple
 
 import pytest
 
@@ -27,6 +27,7 @@ def is_supported_framework(app: Any) -> bool:
         or (module_name == "fastapi" and app_type == "FastAPI")
     )
 
+
 def extract_app_from_client(client: Any) -> Optional[Any]:
     """Extract app from various client types."""
     # Typical attributes used by popular clients
@@ -46,10 +47,11 @@ def extract_app_from_client(client: Any) -> Optional[Any]:
 
     # Flask's test client may expose the application via "application" or "app"
     if hasattr(client, "_app"):
-        return getattr(client, "_app")
+        return client._app
 
     return None
 
+
 def pytest_addoption(parser: pytest.Parser) -> None:
     """Add API coverage flags to the pytest parser."""
     add_pytest_api_cov_flags(parser)
@@ -137,7 +139,9 @@ def fixture_func(request: pytest.FixtureRequest) -> Any:
             try:
                 app = request.getfixturevalue("app")
             except pytest.FixtureLookupError:
-                logger.warning(f"> Coverage not enabled and no existing fixture available for '{fixture_name}', returning None")
+                logger.warning(
+                    f"> Coverage not enabled and no existing fixture available for '{fixture_name}', returning None"
+                )
                 yield None
                 return
             # if we have an app, attempt to create a tracked client using adapter without recorder
@@ -146,11 +150,12 @@ def fixture_func(request: pytest.FixtureRequest) -> Any:
 
                 adapter = get_framework_adapter(app)
                 client = adapter.get_tracked_client(None, request.node.name)
-                yield client
-                return
-            except Exception:
+            except Exception:  # noqa: BLE001
                 yield existing_client
                 return
+            else:
+                yield client
+                return
 
         # At this point coverage is enabled and coverage_data exists
         if existing_client is None:
@@ -187,7 +192,9 @@ def fixture_func(request: pytest.FixtureRequest) -> Any:
                     for endpoint_method in endpoints:
                         method, path = endpoint_method.split(" ", 1)
                         coverage_data.add_discovered_endpoint(path, method, f"{framework_name.lower()}_adapter")
-                    logger.info(f"> pytest-api-coverage: Discovered {len(endpoints)} endpoints when creating '{fixture_name}'.")
+                    logger.info(
+                        f"> pytest-api-coverage: Discovered {len(endpoints)} endpoints when creating '{fixture_name}'."
+                    )
             except Exception as e:  # noqa: BLE001
                 logger.warning(f"> pytest-api-coverage: Could not discover endpoints from app. Error: {e}")
 
@@ -203,13 +210,17 @@ def fixture_func(request: pytest.FixtureRequest) -> Any:
 
                 adapter = get_framework_adapter(app)
                 client = adapter.get_tracked_client(coverage_data.recorder, request.node.name)
-                yield client
-                return
             except Exception as e:  # noqa: BLE001
                 logger.warning(f"> Failed to create tracked client for '{fixture_name}': {e}")
+            else:
+                yield client
+                return
 
         # Last resort: yield None but do not skip
-        logger.warning(f"> create_coverage_fixture('{fixture_name}') could not provide a client; tests will run without API coverage for this fixture.")
+        logger.warning(
+            f"> create_coverage_fixture('{fixture_name}') could not provide a client; "
+            "tests will run without API coverage for this fixture."
+        )
         yield None
 
     fixture_func.__name__ = fixture_name
@@ -225,7 +236,7 @@ class CoverageWrapper:
         def __init__(self, wrapped_client: Any) -> None:
             self._wrapped = wrapped_client
 
-        def _extract_path_and_method(self, name: str, args: Any, kwargs: Any) -> Optional[tuple]:
+        def _extract_path_and_method(self, name: str, args: Any, kwargs: Any) -> Optional[Tuple[str, str]]:
             # Try several strategies to obtain a path and method
             path = None
             method = None
@@ -243,9 +254,10 @@ def _extract_path_and_method(self, name: str, args: Any, kwargs: Any) -> Optiona
                     try:
                         path = first.url.path
                         method = getattr(first, "method", name).upper()
-                        return path, method
-                    except Exception:
+                    except Exception:  # noqa: BLE001
                         pass
+                    else:
+                        return path, method
 
             # Try kwargs-based FlaskClient open signature
             if kwargs:
@@ -272,7 +284,8 @@ def tracked_method(*args: Any, **kwargs: Any) -> Any:
 
                 return tracked_method
 
-            elif name == "open":
+            if name == "open":
+
                 def tracked_open(*args: Any, **kwargs: Any) -> Any:
                     response = attr(*args, **kwargs)
                     if recorder is not None:
@@ -285,6 +298,7 @@ def tracked_open(*args: Any, **kwargs: Any) -> Any:
                 return tracked_open
 
             return attr
+
     return CoverageWrapper(client)
 
 
@@ -300,30 +314,48 @@ def coverage_client(request: pytest.FixtureRequest) -> Any:
     coverage_data = getattr(session, "api_coverage_data", None)
     if coverage_data is None:
         pytest.skip("API coverage data not initialized. This should not happen.")
-    
+
     client = None
     for fixture_name in config.client_fixture_names:
         try:
             client = request.getfixturevalue(fixture_name)
             logger.info(f"> Found custom fixture '{fixture_name}', wrapping with coverage tracking")
             break
         except pytest.FixtureLookupError:
-            logger.warning(f"> Custom fixture '{fixture_name}' not found, trying next one")
+            logger.debug(f"> Custom fixture '{fixture_name}' not found, trying next one")
             continue
-    
+
+    if client is None:
+        # Try to fallback to an 'app' fixture and create a tracked client
+        try:
+            app = request.getfixturevalue("app")
+            logger.info("> Found 'app' fixture, creating tracked client from app")
+            from .frameworks import get_framework_adapter
+
+            adapter = get_framework_adapter(app)
+            client = adapter.get_tracked_client(coverage_data.recorder, request.node.name)
+        except pytest.FixtureLookupError:
+            logger.warning("> No test client fixture found and no 'app' fixture available. Falling back to None")
+            client = None
+        except Exception as e:  # noqa: BLE001
+            logger.warning(f"> Failed to create tracked client from 'app' fixture: {e}")
+            client = None
+
     if client is None:
-        logger.warning("> No test client fixture found, skipping coverage tracking")
+        logger.warning("> Coverage client could not be created; tests will run without API coverage for this session.")
         return None
 
     app = extract_app_from_client(client)
     logger.debug(f"> Extracted app from client: {app}, app type: {type(app).__name__ if app else None}")
 
     if app is None:
-        logger.warning("> No app found, skipping coverage tracking")
+        logger.warning("> No app found, returning client without coverage tracking")
         return client
 
     if not is_supported_framework(app):
-        logger.warning(f"> Unsupported framework: {type(app).__name__}. pytest-api-coverage supports Flask and FastAPI.")
+        logger.warning(
+            f"> Unsupported framework: {type(app).__name__}. pytest-api-coverage supports Flask and FastAPI."
+        )
         return client
 
     try:
@@ -348,9 +380,6 @@ def coverage_client(request: pytest.FixtureRequest) -> Any:
         except Exception as e:  # noqa: BLE001
             logger.warning(f"> pytest-api-coverage: Could not discover endpoints. Error: {e}")
             return client
-    
-    else:
-        logger.debug(f"> Endpoints already discovered: {len(coverage_data.discovered_endpoints.endpoints)}")
 
     return wrap_client_with_coverage(client, coverage_data.recorder, request.node.name)
 

tests/integration/test_plugin_integration.py

@@ -99,7 +99,7 @@ def test_with_custom_client(coverage_client):
 
     result = pytester.runpytest(
         "--api-cov-report",
-        "--api-cov-client-fixture-name=my_custom_client",
+        "--api-cov-client-fixture-names=my_custom_client",
         "--api-cov-show-covered-endpoints",
     )
 
@@ -150,7 +150,7 @@ def test_with_custom_client(coverage_client):
 
     result = pytester.runpytest(
         "--api-cov-report",
-        "--api-cov-client-fixture-name=my_api_client",
+        "--api-cov-client-fixture-names=my_api_client",
         "--api-cov-show-covered-endpoints",
     )
 
@@ -188,7 +188,7 @@ def test_root(coverage_client):
 
     result = pytester.runpytest(
         "--api-cov-report",
-        "--api-cov-client-fixture-name=nonexistent_fixture",
+        "--api-cov-client-fixture-names=nonexistent_fixture",
     )
 
     assert result.ret == 0
@@ -268,6 +268,14 @@ def from_app():
                 def from_main():
                     return "From main.py"
             """,
+            "conftest.py": """
+                import pytest
+                from app import app as app_instance
+
+                @pytest.fixture
+                def app():
+                    return app_instance
+            """,
             "test_multiple.py": """
                 def test_endpoint(coverage_client):
                     response = coverage_client.get("/from-app-py")