Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20386-batch-processing-refactoring

Author: adrianoaru-nhs

.github/actions/run-playwright-tests/action.yml

@@ -8,7 +8,7 @@ inputs:
     required: true
     type: string
   marker_to_use:
-    description: "The test marker to use when running tests (e.g. smokescreen)"
+    description: "The test marker to use when running tests (e.g. smoke)"
     required: true
     type: string
 
@@ -29,13 +29,10 @@ runs:
       run: python -m playwright install --with-deps
     - name: Run specified tests
       shell: bash
-      run: pytest -m ${{ inputs.marker_to_use }} --base-url=$URL_TO_USE --ignore=tests_utils/
-      env:
-        BCSS_PASS: ${{ secrets.BCSS_PASS }}
-        ORACLE_DB: ${ ${{ secrets.ORACLE_DB }}/<REPLACE>/${{ inputs.bcss_cloud_environment }} }
-        ORACLE_USERNAME: ${{ secrets.ORACLE_USERNAME }}
-        ORACLE_PASS: ${{ secrets.ORACLE_PASS }}
-        URL_TO_USE: ${ ${{ vars.CLOUD_ENV_URL }}/<REPLACE>/${{ inputs.bcss_cloud_environment }} }
+      run: |
+        URL_TO_USE="${URL_TO_USE_DEFAULT//<REPLACE>/${{ inputs.bcss_cloud_environment }}}"
+        ORACLE_DB="${ORACLE_DB_DEFAULT//<REPLACE>/${{ inputs.bcss_cloud_environment }}}"
+        pytest -m ${{ inputs.marker_to_use }} --base-url=https://$URL_TO_USE --ignore=tests_utils/
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }}
       with:

.github/workflows/execute-tests.yaml

@@ -1,5 +1,10 @@
 name: "Test Runner"
 
+# This workflow is triggered manually and allows the user to specify the environment and test marker to run.
+# It is functional, however will not work against BCSS test environments until we configure some self-hosted
+# GitHub runners, as the GitHub-hosted runners are based outside of the UK so get blocked by the WAF on the
+# environments.
+
 on:
   workflow_dispatch:
     inputs:
@@ -17,12 +22,19 @@ jobs:
   run-tests:
     name: "Run Specified Tests"
     runs-on: ubuntu-latest
-    timeout-minutes: 3
+    timeout-minutes: 10
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v4
       - name: "Run Tests"
+        id: run-tests
         uses: ./.github/actions/run-playwright-tests
         with:
           bcss_cloud_environment: "${{ inputs.bcss_cloud_environment }}"
           marker_to_use: "${{ inputs.marker_to_use }}"
+        env:
+          BCSS_PASS: ${{ secrets.BCSS_PASS }}
+          ORACLE_DB_DEFAULT: ${{ secrets.ORACLE_DB }}
+          ORACLE_USERNAME: ${{ secrets.ORACLE_USERNAME }}
+          ORACLE_PASS: ${{ secrets.ORACLE_PASS }}
+          URL_TO_USE_DEFAULT: ${{ vars.CLOUD_ENV_URL }}

pages/screening_practitioner_appointments/subject_datasets.py

@@ -0,0 +1,55 @@
+from playwright.sync_api import Page, expect
+from pages.base_page import BasePage
+from enum import Enum
+
+
+class SubjectDatasets(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+
+        self.show_dataset_button = self.page.get_by_role("link", name="Show Dataset")
+
+        self.save_dataset_button = self.page.locator(
+            "#UI_DIV_BUTTON_SAVE1"
+        ).get_by_role("button", name="Save Dataset")
+
+        self.select_asa_grade_dropdown = self.page.get_by_label("ASA Grade")
+
+        self.select_fit_for_colonoscopy_dropdown = self.page.get_by_label(
+            "Fit for Colonoscopy (SSP)"
+        )
+
+        self.dataset_complete_radio_button_yes = self.page.get_by_role(
+            "radio", name="Yes"
+        )
+
+        self.dataset_complete_radio_button_no = self.page.get_by_role(
+            "radio", name="No"
+        )
+
+    def click_show_datasets(self) -> None:
+        self.click(self.show_dataset_button)
+
+    def save_dataset(self) -> None:
+        self.click(self.save_dataset_button)
+
+    def select_asa_grade_option(self, option: str) -> None:
+        self.select_asa_grade_dropdowen.select_option(option)
+
+    def select_fit_for_colonoscopy_option(self, option: str) -> None:
+        self.select_fit_for_colonoscopy_dropdown.select_option(option)
+
+    def click_dataset_complete_radio_button_yes(self) -> None:
+        self.dataset_complete_radio_button_yes.check()
+
+    def click_dataset_complete_radio_button_no(self) -> None:
+        self.dataset_complete_radio_button_no.check()
+
+
+class AsaGradeOptions(Enum):
+    FIT = "17009"
+
+
+class FitForColonoscopySspOptions(Enum):
+    YES = "17058"

tests/smokescreen/test_compartment_5.py

@@ -5,6 +5,11 @@
 from pages.screening_practitioner_appointments.screening_practitioner_appointments import (
     ScreeningPractitionerAppointmentsPage,
 )
+from pages.screening_practitioner_appointments.subject_datasets import (
+    SubjectDatasets,
+    FitForColonoscopySspOptions,
+    AsaGradeOptions,
+)
 from pages.screening_subject_search.subject_screening_summary import (
     SubjectScreeningSummary,
 )
@@ -94,22 +99,25 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     SubjectScreeningSummary(page).click_datasets_link()
 
     # Click on 'Show Dataset' next to the Colonoscopy Assessment
+    SubjectDatasets(page).click_show_datasets()
 
     # Populate Colonoscopy Assessment Details fields
 
     # ASA Grade  - I - Fit
+    SubjectDatasets(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
+
     # Fit for Colonoscopy (SSP) - Yes
+    SubjectDatasets(page).select_fit_for_colonoscopy_option(
+        FitForColonoscopySspOptions.YES.value
+    )
 
     # Click 'Yes' for Dataset Complete?
+    SubjectDatasets(page).click_dataset_complete_radio_button_yes()
+
     # Click Save Dataset button
+    SubjectDatasets(page).save_dataset()
+
     # Click Back
-    page.get_by_role("link", name="Show Dataset").click()
-    page.get_by_label("ASA Grade").select_option("17009")
-    page.get_by_label("Fit for Colonoscopy (SSP)").select_option("17058")
-    page.get_by_role("radio", name="Yes").check()
-    page.locator("#UI_DIV_BUTTON_SAVE1").get_by_role(
-        "button", name="Save Dataset"
-    ).click()
     BasePage(page).click_back_button()
     BasePage(page).click_back_button()
     # This brings you back to the subject screening summary page