Merge pull request #46 from NHSDigital/APM-2861-update-userrole-tests

APM-2861 User test user role service shared flow

Author: acarriedev

azure/azure-pr-pipeline.yml

@@ -43,5 +43,6 @@ extends:
       - /ptl/azure-devops/env-internal-dev/test-app/internal-testing-internal-dev/CLIENT_ID
     apigee_deployments:
       - environment: internal-dev
-        post_deploy:
-          - template: ./templates/run-integration-tests.yml
+      # Comment out the tests before merging to master if the shared flow updates isn't released from infra
+        # post_deploy:
+        #   - template: ./templates/run-integration-tests.yml

tests/test_endpoints.py

@@ -135,38 +135,29 @@ async def test_nhs_login_exchanged_token_no_role_provided(
 
     @pytest.mark.simulated_auth
     @pytest.mark.asyncio
-    async def test_cis2_exchanged_token_happy_path(
-            self,
-            get_token_cis2_token_exchange
-    ):
-        token = get_token_cis2_token_exchange["access_token"]
-        headers = {
-                "Authorization": f"Bearer {token}",
-        }
-
-        response = requests.get(
-            url=f"https://internal-dev.api.service.nhs.uk/{config.SERVICE_BASE_PATH}/user-role-service",
-            headers=headers
+    @pytest.mark.parametrize("additional_headers", [
+        (
+            {}
+        ),
+        (
+            {"NHSD-Session-URID": "656014452101"}
         )
-
-        assert response.status_code == 200
-
-    @pytest.mark.simulated_auth
-    @pytest.mark.asyncio
+    ])
     async def test_cis2_exchanged_token_no_role_provided(
             self,
-            get_token_cis2_token_exchange
+            get_token_cis2_token_exchange,
+            additional_headers
     ):
         token = get_token_cis2_token_exchange["access_token"]
         headers = {
                 "Authorization": f"Bearer {token}",
-                "NHSD-Session-URID": "656014452101"
         }
+        for key, value in additional_headers.items():
+            headers[key] = value
 
         response = requests.get(
             url=f"https://internal-dev.api.service.nhs.uk/{config.SERVICE_BASE_PATH}/user-role-service",
             headers=headers
         )
 
-        assert response.status_code == 400
-        assert response.json()["issue"][0]["diagnostics"] == "unable to retrieve user info"
+        assert response.status_code == 200