APM-5874: Amend tests for spearate auth happy path

Author: fayez166

tests/test_user_roles.py

@@ -38,6 +38,17 @@ class TestUserRoles:
                 ),
                 id="User role sent in header (no in id token, multiple in user info)",
             ),
+            pytest.param(
+                {"NHSD-Session-URID": "656014452101"},
+                marks=pytest.mark.nhsd_apim_authorization(
+                    access="healthcare_worker",
+                    level="aal3",
+                    login_form={"username": "656005750104"},
+                    authentication="separate",
+                    force_new_token=True,
+                ),
+                id="CIS2 separate: User role sent in header",
+            ),
         ],
     )
     def test_user_role_happy_path(
@@ -109,26 +120,6 @@ def test_user_role_happy_path(
                 ),
                 id="Invalid role in header",
             ),
-        ],
-    )
-    def test_user_role_unhappy_path(
-        self,
-        nhsd_apim_proxy_url,
-        nhsd_apim_auth_headers,
-        additional_headers,
-        error_description,
-    ):
-        resp = requests.get(
-            url=f"{nhsd_apim_proxy_url}/user-role-service",
-            headers={**nhsd_apim_auth_headers, **additional_headers},
-        )
-
-        assert resp.status_code == 400
-        assert resp.text == error_description
-
-    @pytest.mark.parametrize(
-        "additional_headers,error_description",
-        [
             pytest.param(
                 {},
                 "selected_roleid is missing in your token",
@@ -151,57 +142,9 @@ def test_user_role_unhappy_path(
                 ),
                 id="NHS Login combined: Can't use header to fetch from userinfo",
             ),
-            pytest.param(
-                {},
-                "selected_roleid is missing in your token",
-                marks=pytest.mark.nhsd_apim_authorization(
-                    access="patient",
-                    level="P9",
-                    login_form={"username": "9912003071"},
-                    authentication="separate",
-                    force_new_token=True,
-                ),
-                id="NHS Login separate: Role can't be used from token",
-            ),
-            pytest.param(
-                {"NHSD-Session-URID": "9912003071"},
-                "unable to retrieve user info",
-                marks=pytest.mark.nhsd_apim_authorization(
-                    access="patient",
-                    level="P9",
-                    login_form={"username": "9912003071"},
-                    authentication="separate",
-                    force_new_token=True,
-                ),
-                id="NHS Login separate: Can't use header to fetch from userinfo",
-            ),
-            pytest.param(
-                {},
-                "selected_roleid is missing in your token",
-                marks=pytest.mark.nhsd_apim_authorization(
-                    access="healthcare_worker",
-                    level="aal3",
-                    login_form={"username": "656005750104"},
-                    authentication="separate",
-                    force_new_token=True,
-                ),
-                id="CIS2 separate: Role can't be used from token",
-            ),
-            pytest.param(
-                {"NHSD-Session-URID": "656005750104"},
-                "unable to retrieve user info",
-                marks=pytest.mark.nhsd_apim_authorization(
-                    access="healthcare_worker",
-                    level="aal3",
-                    login_form={"username": "656005750104"},
-                    authentication="separate",
-                    force_new_token=True,
-                ),
-                id="CIS2 separate: Can't use header to fetch from userinfo",
-            ),
         ],
     )
-    def test_error_when_not_cis2_combined_auth(
+    def test_user_role_unhappy_path(
         self,
         nhsd_apim_proxy_url,
         nhsd_apim_auth_headers,