Merge remote-tracking branch 'origin' into feature/BCSS-20365-compartment-5-pom-for-contact-with-patient-page

Author: vidhya-chandra1

.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/appointment_calendar_page.py

@@ -0,0 +1,27 @@
+from playwright.sync_api import Page, expect
+from pages.base_page import BasePage
+
+
+class AppointmentCalendar(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Appointment Calendar - page filters
+        self.appointment_type_drowdown = self.page.locator("#UI_APPOINTMENT_TYPE")
+        self.screening_centre_dropdown = self.page.locator("#UI_SCREENING_CENTRE")
+        self.site_dropdown = self.page.locator("#UI_SITE")
+        self.view_appointments_on_this_day_button = self.page.get_by_role(
+            "button", name="View appointments on this day"
+        )
+
+    def select_appointment_type_dropdown(self, type: str) -> None:
+        self.appointment_type_drowdown.select_option(label=type)
+
+    def select_screening_centre_dropdown(self, screening_centre: str) -> None:
+        self.screening_centre_dropdown.select_option(label=screening_centre)
+
+    def select_site_dropdown(self, site: str) -> None:
+        self.site_dropdown.select_option(label=site)
+
+    def click_view_appointments_on_this_day_button(self) -> None:
+        self.click(self.view_appointments_on_this_day_button)

pages/screening_practitioner_appointments/appointment_detail_page.py

@@ -0,0 +1,28 @@
+from playwright.sync_api import Page, expect
+from pages.base_page import BasePage
+
+
+class AppointmentDetail(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Appointment Detail - page filters
+        self.attendance_radio = self.page.get_by_role("radio", name="Attendance")
+        self.attended_check_box = self.page.locator("#UI_ATTENDED")
+        self.calendar_button = self.page.get_by_role("button", name="Calendar")
+        self.save_button = self.page.get_by_role("button", name="Save")
+
+    def check_attendance_radio(self) -> None:
+        self.attendance_radio.check()
+
+    def check_attended_check_box(self) -> None:
+        self.attended_check_box.check()
+
+    def click_calendar_button(self) -> None:
+        self.click(self.calendar_button)
+
+    def click_save_button(self) -> None:
+        self.click(self.save_button)
+
+    def verify_text_visible(self, text: str) -> None:
+        expect(self.page.get_by_text(text)).to_be_visible()

pages/screening_practitioner_appointments/screening_practitioner_day_view.py

@@ -0,0 +1,15 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+class ScreeningPractitionerDayView(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Screening Practitioner Day View   - page locators
+        self.calendar_button = page.get_by_role("button", name="Calendar")
+
+    def click_calendar_button(self) -> None:
+        self.click(self.calendar_button)
+
+    def click_patient_link(self, patient_name: str) -> None:
+        self.click(self.page.get_by_role("link", name=patient_name))

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"

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -0,0 +1,62 @@
+from playwright.sync_api import Page, expect, Locator
+from pages.base_page import BasePage
+
+
+class AdvanceFOBTScreeningEpisode(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Advance FOBT Screening Episode - page locators
+        self.suitable_for_endoscopic_test_button = self.page.get_by_role(
+            "button", name="Suitable for Endoscopic Test"
+        )
+        self.calendar_button = self.page.get_by_role("button", name="Calendar")
+        self.test_type_dropdown = self.page.locator("#UI_EXT_TEST_TYPE_2233")
+        self.invite_for_diagnostic_test_button = self.page.get_by_role(
+            "button", name="Invite for Diagnostic Test >>"
+        )
+        self.attend_diagnostic_test_button = self.page.get_by_role(
+            "button", name="Attend Diagnostic Test"
+        )
+        self.other_post_investigation_button = self.page.get_by_role(
+            "button", name="Other Post-investigation"
+        )
+        self.record_other_post_investigation_contact_button = self.page.get_by_role(
+            "button", name="Record other post-"
+        )
+
+    def click_suitable_for_endoscopic_test_button(self) -> None:
+        AdvanceFOBTScreeningEpisode(self.page).safe_accept_dialog(
+            self.suitable_for_endoscopic_test_button
+        )
+
+    def click_calendar_button(self) -> None:
+        self.click(self.calendar_button)
+
+    def select_test_type_dropdown_option(self, text: str) -> None:
+        self.test_type_dropdown.select_option(label=text)
+
+    def click_invite_for_diagnostic_test_button(self) -> None:
+        AdvanceFOBTScreeningEpisode(self.page).safe_accept_dialog(
+            self.invite_for_diagnostic_test_button
+        )
+
+    def click_attend_diagnostic_test_button(self) -> None:
+        self.click(self.attend_diagnostic_test_button)
+
+    def click_other_post_investigation_button(self) -> None:
+        AdvanceFOBTScreeningEpisode(self.page).safe_accept_dialog(
+            self.other_post_investigation_button
+        )
+
+    def get_latest_event_status_cell(self, latest_event_status: str) -> Locator:
+        return self.page.get_by_role("cell", name=latest_event_status, exact=True)
+
+    def verify_latest_event_status_value(self, latest_event_status: str) -> None:
+        latest_event_status_cell = self.get_latest_event_status_cell(
+            latest_event_status
+        )
+        expect(latest_event_status_cell).to_be_visible()
+
+    def click_record_other_post_investigation_contact_button(self) -> None:
+        self.click(self.record_other_post_investigation_contact_button)

pages/screening_subject_search/attend_diagnostic_test_page.py

@@ -0,0 +1,21 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class AttendDiagnosticTest(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Advance Diagnostic Test - page locators
+        self.actual_type_of_test_dropdown = self.page.locator("#UI_CONFIRMED_TYPE_OF_TEST")
+        self.calendar_button = self.page.get_by_role("button", name="Calendar")
+        self.save_button =self.page.get_by_role("button", name="Save")
+
+    def select_actual_type_of_test_dropdown_option(self, text: str) -> None:
+        self.actual_type_of_test_dropdown.select_option(label=text)
+
+    def click_calendar_button(self) -> None:
+        self.click(self.calendar_button)
+
+    def click_save_button(self) -> None:
+        self.click(self.save_button)

requirements.txt

@@ -7,3 +7,4 @@ pandas~=2.2.3
 python-dotenv~=1.0.1
 sqlalchemy>=2.0.38
 jproperties~=2.1.2
+pypdf>=5.3.0

tests/smokescreen/bcss_smokescreen_tests.properties

@@ -32,6 +32,13 @@
     c4_eng_site_name2=The Royal Hospital (Wolverhampton)
     c4_eng_practitioner_name=Astonish, Ethanol
 
+# ----------------------------------
+#   compartment 5
+# ----------------------------------
+    c5_eng_appointment_type=Colonoscopy Assessment
+    c5_eng_screening_centre=BCS001 - Wolverhampton Bowel Cancer Screening Centre
+    c5_eng_site=(all)
+
 # ----------------------------------
 #   compartment 6
 # ----------------------------------
@@ -78,7 +85,7 @@
 # ----------------------------------
 #   compartment 5
 # ----------------------------------
-#    c5_eng_number_of_screening_appts_to_attend=6
+#    c5_eng_number_of_screening_appts_to_attend=5
 
 # ----------------------------------
 #   compartment 6