fixes list not being a string

Author: kevinmason-nhs

tests/conftest.py

@@ -293,7 +293,7 @@ async def user_restricted_app(
     if apim_app_flow_vars is not None:
         app = await make_app(
             user_restricted_product,
-            {"asid": asid, "apim-app-flow-vars": apim_app_flow_vars},
+            {"asid": asid, "apim-app-flow-vars": str(apim_app_flow_vars)},
         )
     else:
         app = await make_app(user_restricted_product, {"asid": asid})

tests/integration/test_user_restricted.py

@@ -57,8 +57,8 @@ async def test_user_restricted_valid_ods_code(
             _HEADER_REQUEST_ID: "DUMMY-VALUE",
             RenamedHeader.REFERRAL_ID.original: _EXPECTED_REFERRAL_ID,
             RenamedHeader.CORRELATION_ID.original: _EXPECTED_CORRELATION_ID,
-            RenamedHeader.BUSINESS_FUNCTION.original: referring_clinician.business_function,
-            RenamedHeader.ODS_CODE.original: referring_clinician.org_code,
+            RenamedHeader.BUSINESS_FUNCTION.original: user.business_function,
+            RenamedHeader.ODS_CODE.original: user.org_code,
             RenamedHeader.FILENAME.original: _EXPECTED_FILENAME,
             RenamedHeader.COMM_RULE_ORG.original: _EXPECTED_COMM_RULE_ORG,
             RenamedHeader.OBO_USER_ID.original: _EXPECTED_OBO_USER_ID,
@@ -79,33 +79,33 @@ async def test_user_restricted_valid_ods_code(
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize(
-        "endpoint_url, is_fhir_4, apim_app_flow_vars",
+        "endpoint_url, is_fhir_4, user ,apim_app_flow_vars",
         [
-            ("", False, ["invalid_code"]),
-            ("/FHIR/R4/", True, ["invalid_code"]),
-            ("/FHIR/STU3/", False, ["invalid_code"]),
+            ("", False, Actor.RC, ["invalid_code"]),
+            ("/FHIR/R4/", True, Actor.RC, ["invalid_code"]),
+            ("/FHIR/STU3/", False, Actor.RC, ["invalid_code"]),
         ],
     )
     async def test_user_restricted_invalid_ods_code(
         self,
         authenticate_user,
         endpoint_url,
-        referring_clinician,
+        user: Actor,
         is_fhir_4,
         service_url,
         apim_app_flow_vars,
         update_user_restricted_product,
     ):
-        access_code = await authenticate_user(referring_clinician)
+        access_code = await authenticate_user(user)
 
         client_request_headers = {
             _HEADER_ECHO: "",  # enable echo target
             _HEADER_AUTHORIZATION: "Bearer " + access_code,
             _HEADER_REQUEST_ID: "DUMMY-VALUE",
             RenamedHeader.REFERRAL_ID.original: _EXPECTED_REFERRAL_ID,
             RenamedHeader.CORRELATION_ID.original: _EXPECTED_CORRELATION_ID,
-            RenamedHeader.BUSINESS_FUNCTION.original: referring_clinician.business_function,
-            RenamedHeader.ODS_CODE.original: referring_clinician.org_code,
+            RenamedHeader.BUSINESS_FUNCTION.original: user.business_function,
+            RenamedHeader.ODS_CODE.original: user.org_code,
             RenamedHeader.FILENAME.original: _EXPECTED_FILENAME,
             RenamedHeader.COMM_RULE_ORG.original: _EXPECTED_COMM_RULE_ORG,
             RenamedHeader.OBO_USER_ID.original: _EXPECTED_OBO_USER_ID,