Expand FastAPI shell coverage

Author: anth-volk

tests/unit/services/test_economy_service.py

@@ -111,12 +111,20 @@ def make_mock_budget_impact_data(
     }
 
 
-def make_http_status_error(status_code: int, payload: dict) -> httpx.HTTPStatusError:
+def make_http_status_error(
+    status_code: int,
+    payload: dict | None = None,
+    text: str | None = None,
+) -> httpx.HTTPStatusError:
     request = httpx.Request(
         "POST",
         "https://policyengine-staging--policyengine-simulation-gateway-web-app.modal.run/simulate/economy/budget-window",
     )
-    response = httpx.Response(status_code, json=payload, request=request)
+    response = (
+        httpx.Response(status_code, json=payload, request=request)
+        if payload is not None
+        else httpx.Response(status_code, text=text or "", request=request)
+    )
     return httpx.HTTPStatusError(
         f"Client error '{status_code}'",
         request=request,
@@ -1081,6 +1089,46 @@ def test__given_modal_non_validation_error_on_batch_submission__raises(
             )
             mock_budget_window_cache.store_batch_job_id.assert_not_called()
 
+        @pytest.mark.parametrize(
+            ("payload", "expected_message"),
+            [
+                ({"message": "gateway validation failed"}, "gateway validation failed"),
+                ({"error": "invalid request"}, "invalid request"),
+            ],
+        )
+        def test__given_modal_validation_json_error__extracts_message(
+            self, economy_service, payload, expected_message
+        ):
+            error = make_http_status_error(400, payload)
+
+            message = economy_service._build_budget_window_submission_error_message(
+                error
+            )
+
+            assert message == expected_message
+
+        def test__given_modal_validation_plain_text_error__extracts_response_text(
+            self, economy_service
+        ):
+            error = make_http_status_error(400, text="plain validation failed")
+
+            message = economy_service._build_budget_window_submission_error_message(
+                error
+            )
+
+            assert message == "plain validation failed"
+
+        def test__given_modal_validation_empty_error__falls_back_to_exception_text(
+            self, economy_service
+        ):
+            error = make_http_status_error(400, text="")
+
+            message = economy_service._build_budget_window_submission_error_message(
+                error
+            )
+
+            assert message == str(error)
+
         def test__given_cliff_target__raises_value_error(
             self, economy_service, base_params
         ):

tests/unit/test_asgi_factory.py

@@ -2,11 +2,13 @@
 import json
 import sys
 
+import pytest
 from fastapi.testclient import TestClient
 from flask import Flask, Response, jsonify, make_response, request
 from flask_cors import CORS
+from starlette.responses import Response as ASGIResponse
 
-from policyengine_api.asgi_factory import create_asgi_app
+from policyengine_api.asgi_factory import _add_vary_origin, create_asgi_app
 
 
 def create_test_wsgi_app() -> Flask:
@@ -56,6 +58,25 @@ def test_native_health_route_is_fastapi_json():
     assert response.headers["content-type"].startswith("application/json")
 
 
+@pytest.mark.parametrize(
+    ("existing_vary", "expected_vary"),
+    [
+        (None, "Origin"),
+        ("Accept-Encoding", "Accept-Encoding, Origin"),
+        ("Origin", "Origin"),
+        ("Accept-Encoding, origin", "Accept-Encoding, origin"),
+    ],
+)
+def test_add_vary_origin_preserves_existing_values(existing_vary, expected_vary):
+    response = ASGIResponse()
+    if existing_vary is not None:
+        response.headers["Vary"] = existing_vary
+
+    _add_vary_origin(response)
+
+    assert response.headers["Vary"] == expected_vary
+
+
 def test_asgi_entrypoint_imports_and_serves_health(monkeypatch):
     monkeypatch.setenv("FLASK_DEBUG", "1")
     sys.modules.pop("policyengine_api.asgi", None)