Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20326-compartment5-pom-for-screening-practitioner-day-view

# Conflicts:
#	tests/smokescreen/test_compartment_5.py

Author: mepr1

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

@@ -1,6 +1,17 @@
-name: "Run Util & Example Tests"
+name: "Run Playwright Tests"
 runs-on: ubuntu-latest
-timeout-minutes: 3
+timeout-minutes: 10
+
+inputs:
+  bcss_cloud_environment:
+    description: "The environment to run against in lower case (e.g. bcss-1234)"
+    required: true
+    type: string
+  marker_to_use:
+    description: "The test marker to use when running tests (e.g. smokescreen)"
+    required: true
+    type: string
+
 runs:
   using: "composite"
   steps:
@@ -16,18 +27,15 @@ runs:
     - name: Ensure browsers are installed
       shell: bash
       run: python -m playwright install --with-deps
-    - name: Run util tests
+    - name: Run specified tests
       shell: bash
-      run: pytest -m "utils" --ignore=tests/
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() }}
-      with:
-        name: result-output-utils
-        path: test-results/
-        retention-days: 3
-    - name: Run example tests
-      shell: bash
-      run: pytest --ignore=tests_utils/
+      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 }} }
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }}
       with:

.github/workflows/execute-tests.yaml

@@ -0,0 +1,28 @@
+name: "Test Runner"
+
+on:
+  workflow_dispatch:
+    inputs:
+      bcss_cloud_environment:
+        description: "The environment to run against in lower case (e.g. bcss-1234)"
+        required: true
+        type: string
+        default: "bcss-18680"
+      marker_to_use:
+        description: "The test marker to use when running tests (e.g. smokescreen)"
+        required: true
+        type: string
+
+jobs:
+  run-tests:
+    name: "Run Specified Tests"
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v4
+      - name: "Run Tests"
+        uses: ./.github/actions/run-playwright-tests
+        with:
+          bcss_cloud_environment: "${{ inputs.bcss_cloud_environment }}"
+          marker_to_use: "${{ inputs.marker_to_use }}"

pages/screening_subject_search/subject_screening_summary.py

@@ -48,6 +48,10 @@ def __init__(self, page: Page):
         self.first_fobt_episode_link = page.get_by_role(
             "link", name="FOBT Screening"
         ).first
+        self.datasets_link = self.page.get_by_role("link", name="Datasets")
+        self.advance_fobt_screening_episode_button = self.page.get_by_role(
+            "button", name="Advance FOBT Screening Episode"
+        )
 
     def verify_result_contains_text(self, text) -> None:
         expect(self.display_rs).to_contain_text(text)
@@ -122,6 +126,12 @@ def expand_episodes_list(self) -> None:
     def click_first_fobt_episode_link(self) -> None:
         self.click(self.first_fobt_episode_link)
 
+    def click_datasets_link(self) -> None:
+        self.click(self.datasets_link)
+
+    def click_advance_fobt_screening_episode_button(self) -> None:
+        self.click(self.advance_fobt_screening_episode_button)
+
 
 class ChangeScreeningStatusOptions(Enum):
     SEEKING_FURTHER_DATA = "4007"

tests/smokescreen/test_compartment_5.py

@@ -8,9 +8,9 @@
 from pages.screening_subject_search.subject_screening_summary import (
     SubjectScreeningSummary,
 )
-from pages.screening_practitioner_appointments.screening_practitioner_day_view import(
+from pages.screening_practitioner_appointments.screening_practitioner_day_view import (
     ScreeningPractitionerDayView,
-)   
+)
 from utils.user_tools import UserTools
 from utils.load_properties_file import PropertiesFile
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
@@ -72,13 +72,13 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     # Repeat for x Abnormal  patients
 
     # Navigate to the 'Subject Screening Summary' screen for the 1st Abnormal patient
-    nhs_no = "9543076472"  # Test NHS NO for Scaliding Cod
+    nhs_no = "9937265193"  # Test NHS NO for Scaliding Cod
     verify_subject_event_status_by_nhs_no(
         page, nhs_no, "J10 - Attended Colonoscopy Assessment Appointment"
     )
 
     # Click on 'Datasets' link
-    page.get_by_role("link", name="Datasets").click()
+    SubjectScreeningSummary(page).click_datasets_link()
 
     # Click on 'Show Dataset' next to the Colonoscopy Assessment
 
@@ -103,7 +103,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
 
     # On the Subject Screening Summary click on the 'Advance FOBT Screening Episode' button and then click on the 'Suitable for Endoscopic Test' button
     # Click OK after message
-    page.get_by_role("button", name="Advance FOBT Screening Episode").click()
+    SubjectScreeningSummary(page).click_advance_fobt_screening_episode_button()
     page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Suitable for Endoscopic Test").click()
 
@@ -139,7 +139,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     verify_subject_event_status_by_nhs_no(
         page, nhs_no, "A259 - Attended Diagnostic Test"
     )
-    page.get_by_role("button", name="Advance FOBT Screening Episode").click()
+    SubjectScreeningSummary(page).click_advance_fobt_screening_episode_button()
 
     # Click 'Other Post-investigation Contact Required' button
     # Click 'OK'