convert dict to string

Author: kevinmason-nhs

tests/conftest.py

@@ -2,6 +2,7 @@
 import pytest
 import pytest_asyncio
 import warnings
+import json
 
 from uuid import uuid4
 from typing import Collection, Callable, Generator, Dict
@@ -291,9 +292,11 @@ async def user_restricted_app(
 ):
     # Setup
     if apim_app_flow_vars is not None:
+        odslist = json.dumps({"ers": {"allowListodsCode": str(apim_app_flow_vars)}})
+        print(f"Using apim_app_flow_vars: {odslist}")
         app = await make_app(
             user_restricted_product,
-            {"asid": asid, "apim-app-flow-vars": str(apim_app_flow_vars)},
+            {"asid": asid, "apim-app-flow-vars": odslist},
         )
     else:
         app = await make_app(user_restricted_product, {"asid": asid})

tests/integration/test_user_restricted.py

@@ -34,9 +34,9 @@ class TestUserRestricted:
     @pytest.mark.parametrize(
         "endpoint_url, is_fhir_4, user, apim_app_flow_vars ",
         [
-            ("", False, Actor.RC, [Actor.RC.org_code]),
-            ("/FHIR/R4/", True, Actor.RC, [Actor.RC.org_code]),
-            ("/FHIR/STU3/", False, Actor.RC, [Actor.RC.org_code]),
+            ("", False, Actor.RC_DEV, [Actor.RC_DEV.org_code]),
+            ("/FHIR/R4/", True, Actor.RC_DEV, [Actor.RC_DEV.org_code]),
+            ("/FHIR/STU3/", False, Actor.RC_DEV, [Actor.RC_DEV.org_code]),
         ],
     )
     async def test_user_restricted_valid_ods_code(
@@ -81,9 +81,9 @@ async def test_user_restricted_valid_ods_code(
     @pytest.mark.parametrize(
         "endpoint_url, is_fhir_4, user ,apim_app_flow_vars",
         [
-            ("", False, Actor.RC, ["invalid_code"]),
-            ("/FHIR/R4/", True, Actor.RC, ["invalid_code"]),
-            ("/FHIR/STU3/", False, Actor.RC, ["invalid_code"]),
+            ("", False, Actor.RC_DEV, ["invalid_code"]),
+            ("/FHIR/R4/", True, Actor.RC_DEV, ["invalid_code"]),
+            ("/FHIR/STU3/", False, Actor.RC_DEV, ["invalid_code"]),
         ],
     )
     async def test_user_restricted_invalid_ods_code(