test-suite

Author: BJSS-russell-pollock

gateway-api/tests/conftest.py

@@ -148,10 +148,10 @@ def get_headers(request: pytest.FixtureRequest) -> Any:
     """Return merged auth headers for remote tests, or empty dict for local."""
     env = request.config.getoption("--env")
     if env == "remote":
-        merged_auth_headers = request.getfixturevalue(
-            "nhsd_apim_auth_headers"
-        ) | request.getfixturevalue("status_endpoint_auth_headers")
-        return merged_auth_headers
+        nhsd_headers = request.getfixturevalue("nhsd_apim_auth_headers")
+        apikey_headers = request.getfixturevalue("status_endpoint_auth_headers")
+        return nhsd_headers | apikey_headers
+
     return {}
 
 
@@ -162,21 +162,15 @@ def client(
     mtls_cert: tuple[str, str] | None,
 ) -> Client:
     """Create the appropriate HTTP client."""
-    env = os.getenv("ENV") or request.config.getoption("--env")
+    env = request.config.getoption("--env")
 
     if env == "local":
         return LocalClient(base_url=base_url, cert=mtls_cert)
     elif env == "remote":
         proxy_url = request.getfixturevalue("nhsd_apim_proxy_url")
-
+        auth_headers = request.getfixturevalue("nhsd_apim_auth_headers")
         apikey_headers = request.getfixturevalue("status_endpoint_auth_headers")
-        token = os.getenv("APIGEE_ACCESS_TOKEN")
-
-        if token:
-            auth_headers = {"Authorization": f"Bearer {token}", **apikey_headers}
-        else:
-            nhsd_headers = request.getfixturevalue("nhsd_apim_auth_headers")
-            auth_headers = nhsd_headers | apikey_headers
+        auth_headers = auth_headers | apikey_headers
 
         return RemoteClient(
             api_url=proxy_url, auth_headers=auth_headers, cert=mtls_cert