✅ Isolate tests from config

Shortcake-Parent: main

Author: patrick91

tests/conftest.py

@@ -1,15 +1,28 @@
+import os
 import sys
+import tempfile
 from collections.abc import Generator
 from dataclasses import dataclass
 from pathlib import Path
-from unittest.mock import patch
 
 import pytest
+import respx
 from typer import rich_utils
 
+from fastapi_cloud_cli.config import Settings
+from fastapi_cloud_cli.utils.config import CONFIG_DIR_ENV_VAR
+
 from .utils import create_jwt_token
 
 
+@pytest.fixture(autouse=True)
+def isolate_config() -> Generator[None]:
+    with tempfile.TemporaryDirectory() as tmpdir:
+        os.environ[CONFIG_DIR_ENV_VAR] = str(tmpdir)
+
+        yield
+
+
 @pytest.fixture(autouse=True)
 def reset_syspath() -> Generator[None, None, None]:
     initial_python_path = sys.path.copy()
@@ -26,6 +39,23 @@ def setup_terminal() -> None:
     return
 
 
+@pytest.fixture
+def settings() -> Settings:
+    return Settings.get()
+
+
+@pytest.fixture
+def respx_mock(
+    request: pytest.FixtureRequest, settings: Settings
+) -> Generator[respx.MockRouter, None, None]:
+    respx_marker = request.node.get_closest_marker("respx")
+    kwargs = {} if respx_marker is None else dict(respx_marker.kwargs)
+    kwargs.setdefault("base_url", settings.base_api_url)
+
+    with respx.mock(**kwargs) as mock_router:
+        yield mock_router
+
+
 @pytest.fixture
 def logged_in_cli(temp_auth_config: Path) -> Generator[None, None, None]:
     valid_token = create_jwt_token({"sub": "test_user_12345"})
@@ -63,10 +93,10 @@ def configured_app(tmp_path: Path) -> ConfiguredApp:
 
 
 @pytest.fixture
-def temp_auth_config(tmp_path: Path) -> Generator[Path, None, None]:
+def temp_auth_config(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> Generator[Path, None, None]:
     """Provides a temporary auth config setup for testing file operations."""
 
-    with patch(
-        "fastapi_cloud_cli.utils.config.get_config_folder", return_value=tmp_path
-    ):
-        yield tmp_path / "auth.json"
+    monkeypatch.setenv(CONFIG_DIR_ENV_VAR, str(tmp_path))
+    yield tmp_path / "auth.json"

tests/test_api_client.py

@@ -17,8 +17,6 @@
 )
 from tests.utils import build_logs_response
 
-settings = Settings.get()
-
 
 @pytest.fixture
 def client() -> httpx.Client:
@@ -31,7 +29,7 @@ def deployment_id() -> str:
     return "test-deployment-123"
 
 
-api_mock = respx.mock(base_url=settings.base_api_url)
+api_mock = respx.mock(base_url=Settings().base_api_url)
 
 
 @pytest.fixture
@@ -284,7 +282,7 @@ def test_stream_build_logs_empty_lines_are_skipped(
     assert logs[1].type == "complete"
 
 
-@respx.mock(base_url=settings.base_api_url)
+@respx.mock(base_url=Settings().base_api_url)
 def test_stream_build_logs_continue_after_timeout(
     respx_mock: respx.MockRouter,
     client: APIClient,