Disable test if cross_service_tests are turned off

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 }}

pyproject.toml

@@ -52,6 +52,7 @@ markers = [
   "imms_api",
   "log_in",
   "national_reporting",
+  "pds_api",
   "rav",
   "reporting",
   "school_moves",

tests/test_consent_responses.py

@@ -162,7 +162,7 @@ def test_match_unmatched_consent_response_and_verify_activity_log(
     ChildRecordPage(page).click_programme(Programme.HPV)
     ChildProgrammePage(page).verify_activity_log_for_created_or_matched_child()
 
-
+@pytest.mark.pds_api
 def test_create_child_record_from_consent_with_nhs_number(
     give_online_consent_pds_child,
     pds_child,