Merge pull request #996 from NHSDigital/fix-test-consent-responses

Fix test consent responses

Author: zoltan-antal

.github/actions/run-end-to-end-tests/action.yml

@@ -12,6 +12,8 @@ inputs:
     default: 'false'
   imms_api_tests:
     default: 'false'
+  pds_api_tests:
+    default: 'false'
   device:
     required: true
   base_url:
@@ -71,6 +73,13 @@ runs:
             exclude="not imms_api"
           fi
         fi
+        if [ "${{ inputs.pds_api_tests }}" = "false" ]; then
+          if [ -n "$exclude" ]; then
+            exclude="$exclude and not pds_api"
+          else
+            exclude="not pds_api"
+          fi
+        fi
         if [ -z "$exclude" ]; then
           exclude="True"
         fi

.github/workflows/end-to-end-tests-all-devices.yaml

@@ -46,6 +46,7 @@ jobs:
           device: ${{ matrix.device }}
           base_url: ${{ vars.BASE_URL }}
           imms_api_tests: 'true'
+          pds_api_tests: 'true'
           reporting_tests: 'true'
           playwright_cache_hit: ${{ steps.playwright-cache.outputs.cache-hit }}
           screenshot_all_steps: 'false'

.github/workflows/end-to-end-tests-release.yaml

@@ -9,7 +9,7 @@ on:
         default: ''
         type: string
       cross_service_tests:
-        description: 'Include imms api and reporting tests'
+        description: 'Include imms api, pds api and reporting tests'
         required: false
         default: false
         type: boolean
@@ -93,7 +93,7 @@ on:
         required: false
         default: ''
       cross_service_tests:
-        description: 'Include imms api and reporting tests'
+        description: 'Include imms api, pds api and reporting tests'
         required: false
         default: 'true'
         type: choice
@@ -257,6 +257,7 @@ jobs:
         with:
           tests: ${{ steps.set-variables.outputs.tests }}
           imms_api_tests: ${{ steps.set-variables.outputs.cross_service_tests }}
+          pds_api_tests: ${{ steps.set-variables.outputs.cross_service_tests }}
           reporting_tests: ${{ steps.set-variables.outputs.cross_service_tests }}
           github_ref: ${{ inputs.github_ref || github.head_ref }}
           device: ${{ steps.set-variables.outputs.device }}

.github/workflows/end-to-end-tests.yaml

@@ -9,7 +9,7 @@ on:
         default: ''
         type: string
       cross_service_tests:
-        description: 'Include imms api and reporting tests'
+        description: 'Include imms api, pds api and reporting tests'
         required: false
         default: false
         type: boolean
@@ -85,7 +85,7 @@ on:
         required: false
         default: ''
       cross_service_tests:
-        description: 'Include imms api and reporting tests'
+        description: 'Include imms api, pds api and reporting tests'
         required: false
         default: 'true'
         type: choice
@@ -241,6 +241,7 @@ jobs:
         with:
           tests: ${{ steps.set-variables.outputs.tests }}
           imms_api_tests: ${{ steps.set-variables.outputs.cross_service_tests }}
+          pds_api_tests: ${{ steps.set-variables.outputs.cross_service_tests }}
           reporting_tests: ${{ steps.set-variables.outputs.cross_service_tests }}
           github_ref: ${{ inputs.github_ref || github.head_ref }}
           device: ${{ steps.set-variables.outputs.device }}

mavis/test/constants.py

@@ -533,3 +533,18 @@ def to_url(self) -> str:
             os.getenv("IMMS_BASE_URL", "PROVIDEURL"),
             self.value,
         )
+
+
+class PdsEndpoints(StrEnum):
+    GET_PATIENT_DETAILS = "personal-demographics/FHIR/R4/Patient/"
+    SEARCH_FOR_PATIENT = "personal-demographics/FHIR/R4/Patient?"
+
+    @property
+    def to_url(self) -> str:
+        return urllib.parse.urljoin(
+            os.getenv("IMMS_BASE_URL", "PROVIDEURL"),
+            self.value,
+        )
+
+    def to_url_with_suffix(self, suffix: str = "") -> str:
+        return f"{self.to_url}{suffix}"

mavis/test/data/pds.py

@@ -20,6 +20,7 @@
     point_of_care_team,
     schools,
 )
+from .fhir_api import authenticate_api
 from .helpers import (
     add_vaccine_batch,
     log_in_as_medical_secretary,
@@ -32,7 +33,6 @@
     setup_session_and_batches_with_fixed_child,
     upload_offline_vaccination,
 )
-from .imms_api import authenticate_api
 from .onboarding import (
     national_reporting_onboarding,
     point_of_care_onboarding,