Copying over changes from the smokescreen_compartment_3 branch

Author: adrianoaru-nhs

pages/cognito_login_page.py

@@ -0,0 +1,25 @@
+import os
+
+from playwright.sync_api import Page
+
+
+class CognitoLoginPage:
+
+    def __init__(self, page: Page):
+        self.page = page
+        self.username = page.get_by_role("textbox", name="Username")
+        self.password = page.get_by_role("textbox", name="Password")
+        self.submit_button = page.get_by_role("button", name="submit")
+
+    def login_as_user(self, username: str, password: str) -> None:
+        """Logs in to bcss with specified user credentials
+        Args:
+            username (str) enter a username that exists in users.json
+            password (str) the password for the user provided
+        """
+        # Retrieve and enter username from users.json
+        self.username.fill(username)
+        # Retrieve and enter password from .env file
+        self.password.fill(password)
+        # Click Submit
+        self.submit_button.click()

pages/generate_invitations_page.py

@@ -1,7 +1,7 @@
 from playwright.sync_api import Page, expect
 import pytest
 from utils.click_helper import click
-
+import logging
 
 class GenerateInvitations:
     def __init__(self, page: Page):
@@ -33,21 +33,27 @@ def wait_for_invitation_generation_complete(self):
         elapsed = 0
 
         # Loop until the table no longer contains "Queued"
+        logging.info(f"Waiting for successful generation")
         while elapsed < timeout: # there may be a stored procedure to speed this process up
             table_text = self.displayRS.text_content()
-            if "Queued" in table_text or "In Progress" in table_text:
+            if "Failed" in table_text:
+                pytest.fail("Invitation has failed to generate")
+            elif "Queued" in table_text or "In Progress" in table_text:
                 # Click the Refresh button
                 self.click_refresh_button()
                 self.page.wait_for_timeout(wait_interval)
                 elapsed += wait_interval
-            elif "Failed" in table_text:
-                pytest.fail("Invitation has failed to generate")
             else:
                 break
 
         # Final check: ensure that the table now contains "Completed"
-        expect(self.displayRS).to_contain_text("Completed")
+        try:
+            expect(self.displayRS).to_contain_text("Completed")
+            logging.info("Invitations successfully generated")
+            logging.info(f"Invitations took {elapsed/1000} seconds to generate")
+        except Exception as e:
+            pytest.fail("Invitations not generated successfully")
 
         value = self.planned_invitations_total.text_content().strip()  # Get text and remove extra spaces
-        if int(value) <= 5:
-            pytest.fail("There are less than 5 invitations generated")
+        if int(value) < 5:
+            pytest.fail("There are less than 5 invitations generated")

pages/log_out_page.py

@@ -1,5 +1,6 @@
 from playwright.sync_api import Page,expect
-
+from pages.navigation_bar_links import NavigationBar
+import logging
 class Logout:
     def __init__(self, page: Page):
         self.page = page
@@ -9,7 +10,8 @@ def __init__(self, page: Page):
     def verify_log_out_page(self):
         expect(self.log_out_msg).to_be_visible()
 
-
-
-
-
+    def log_out(self):
+        logging.info("Test Complete - Logging Out")
+        NavigationBar(self.page).click_log_out_link()
+        expect(self.log_out_msg).to_be_visible()
+        self.page.close()

pages/subject_screening_page.py

@@ -23,6 +23,10 @@ def __init__(self, page: Page):
         self.laboratory_test_date_filter = self.page.get_by_role("textbox", name="Laboratory Test Date")
         self.diagnostic_test_actual_date_filter = self.page.get_by_role("textbox", name="Diagnostic Test Actual Date")
         self.search_button = self.page.get_by_role("button", name="Search")
+        self.search_area = self.page.locator("#A_C_SEARCH_DOMAIN")
+
+    def select_whole_database_search_area(self):
+        self.search_area.select_option("07")
 
     def click_search_button(self):
         click(self.page, self.search_button)

pytest.ini

@@ -17,7 +17,6 @@ addopts =
 # Allows pytest to identify the base of this project as the pythonpath
 pythonpath = .
 
-
 # These are the tags that pytest will recognise when using @pytest.mark
 markers =
     #example: tests used for example purposes by this blueprint
@@ -28,4 +27,7 @@ markers =
     utils: test setup and support methods
     smoke: tests designed to run as part of the smokescreen regression test suite
     wip: tests that are currently in progress
-    smokescreen: test containing the compartment smokescreen tests
+    smokescreen: all compartments to be run as part of the smokescreen
+    compartment1: only for compartment 1
+    compartment2: only for compartment 2
+    compartment3: only for compartment 3

tests/Smokescreen/test_compartment_1.py

@@ -5,50 +5,54 @@
 from utils.oracle import OracleDB
 
 @pytest.mark.smoke
-@pytest.mark.smokescreen
 @pytest.mark.compartment1
-def test_compartment_1(page: Page) -> None:
-
-    page.goto("/")
-    BcssLoginPage(page).login_as_user("BCSS401")
-
+def test_create_invitations_plan(page: Page) -> None:
+    logging.info("Compartment 1 - Create Invitations Plan")
+    UserTools.user_login(page, "Hub Manager State Registered")
     # Create plan - England
     MainMenu(page).go_to_call_and_recall_page()
     CallAndRecall(page).go_to_planning_and_monitoring_page()
     InvitationsMonitoring(page).go_to_bcss001_invitations_plan_page()
     InvitationsPlans(page).go_to_create_a_plan_page()
+    logging.info("Setting daily invitation rate")
     CreateAPlan(page).click_set_all_button()
     CreateAPlan(page).fill_daily_invitation_rate_field("10")
     CreateAPlan(page).click_update_button()
-    if CreateAPlan(page).confirm_button.is_visible():
-        CreateAPlan(page).click_confirm_button()
+    CreateAPlan(page).click_confirm_button()
     CreateAPlan(page).click_save_button()
     CreateAPlan(page).fill_note_field("test data")
     CreateAPlan(page).click_save_note_button()
     InvitationsPlans(page).invitations_plans_title.wait_for()
+    logging.info("Invitation plan created")
+
+@pytest.mark.smoke
+@pytest.mark.smokescreen
+@pytest.mark.compartment1
+def test_compartment_1(page: Page) -> None:
+    logging.info("Compartment 1 - Generate Invitations")
+    UserTools.user_login(page, "Hub Manager State Registered")
 
     # Generate Invitations
-    NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_call_and_recall_page()
     CallAndRecall(page).go_to_generate_invitations_page()
+    logging.info("Generating invitations based on the invitations plan")
     GenerateInvitations(page).click_generate_invitations_button()
     GenerateInvitations(page).wait_for_invitation_generation_complete()
 
     # Print the batch of Pre-Invitation Letters - England
+    logging.info("Compartment 1 - Process S1 Batch")
     batch_processing(page, "S1", "Pre-invitation (FIT) (digital leaflet)", "S9 - Pre-invitation Sent")
     nhs_number_df = batch_processing(page, "S1", "Pre-invitation (FIT)", "S9 - Pre-invitation Sent")
-    for index, row in nhs_number_df.iterrows():
-        OracleDB().exec_bcss_timed_events(row["subject_nhs_number"])
+    OracleDB().exec_bcss_timed_events(nhs_number_df)
 
     # Print the batch of Invitation & Test Kit Letters - England
+    logging.info("Compartment 1 - Process S9 Batch")
     nhs_number_df = batch_processing(page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent")
-    for index, row in nhs_number_df.iterrows():
-        OracleDB().exec_bcss_timed_events(row["subject_nhs_number"])
+    OracleDB().exec_bcss_timed_events(nhs_number_df)
 
     # Print a set of reminder letters
+    logging.info("Compartment 1 - Process S10 Batch")
     batch_processing(page, "S10", "Test Kit Reminder", "S19 - Reminder of Initial Test Sent")
 
     # Log out
-    NavigationBar(page).click_log_out_link()
-    Logout(page).verify_log_out_page()
-    page.close()
+    Logout(page).log_out()

tests/Smokescreen/test_compartment_2.py

@@ -5,40 +5,55 @@
 from datetime import datetime
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.fit_kit_generation import create_fit_id_df
+import logging
 
-@pytest.mark.wip2
+@pytest.mark.smoke
 @pytest.mark.smokescreen
+@pytest.mark.compartment2
 def test_compartment_2(page: Page) -> None:
-    page.goto("/")
-    BcssLoginPage(page).login_as_user("BCSS401")
+    UserTools.user_login(page, "Hub Manager State Registered")
 
     MainMenu(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()
     subjectdf = create_fit_id_df()
 
-    for subject in range(4):
+    for subject in range(9):
         fit_device_id = subjectdf["fit_device_id"].iloc[subject]
+        logging.info(f"Logging FIT Device ID: {fit_device_id}")
         LogDevices(page).fill_fit_device_id_field(fit_device_id)
-        sample_date = datetime.now().strftime("%d %b %Y")
+        sample_date = datetime.now().strftime("%#d %b %Y")
+        logging.info("Setting sample date to todays date")
         LogDevices(page).fill_sample_date_field(sample_date)
-        LogDevices(page).verify_successfully_logged_device_text()
+        try:
+            LogDevices(page).verify_successfully_logged_device_text()
+            logging.info(f"{fit_device_id} Successfully logged")
+        except:
+            pytest.fail(f"{fit_device_id} unsuccessfully logged")
 
-    nhs_no = subjectdf["nhs_number"].iloc[0]
-    verify_subject_event_status_by_nhs_no(page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)")
+    nhs_no = subjectdf["subject_nhs_number"].iloc[0]
+    try:
+        verify_subject_event_status_by_nhs_no(page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)")
+        logging.info(f"Successfully verified NHS number {nhs_no} with status S43 - Kit Returned and Logged (Initial Test)")
+    except Exception as e:
+        pytest.fail(f"Verification failed for NHS number {nhs_no}: {str(e)}")
 
     NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()
     spoilt_fit_device_id = subjectdf["fit_device_id"].iloc[-1]
+    logging.info(f"Logging Spoilt FIT Device ID: {spoilt_fit_device_id}")
     LogDevices(page).fill_fit_device_id_field(spoilt_fit_device_id)
     LogDevices(page).click_device_spoilt_button()
     LogDevices(page).select_spoilt_device_dropdown_option()
     LogDevices(page).click_log_as_spoilt_button()
-    LogDevices(page).verify_successfully_logged_device_text()
+    try:
+        LogDevices(page).verify_successfully_logged_device_text()
+        logging.info(f"{spoilt_fit_device_id} Successfully logged")
+    except:
+        pytest.fail(f"{spoilt_fit_device_id} unsuccessfully logged")
+
 
     batch_processing(page, "S3", "Retest (Spoilt) (FIT)", "S11 - Retest Kit Sent (Spoilt)")
 
     # Log out
-    NavigationBar(page).click_log_out_link()
-    Logout(page).verify_log_out_page()
-    page.close()
+    Logout(page).log_out()

users.json

@@ -1,34 +1,16 @@
 {
   "_comment": "This file can be used to store data on users for your application, and then pulled through using the utils.user_tools UserTools utility. The documentation for this utility explains how this file is read.",
 
-  "BCSS401": {
+  "Hub Manager State Registered": {
     "username": "BCSS401",
     "roles": [
       "Hub Manager State Registered, Midlands and North West"
     ]
   },
-  "BCSS118": {
+  "Screening Centre Manager": {
     "username": "BCSS118",
     "roles": [
       "Screening Centre Manager for Wolverhampton, Midlands and North West"
     ]
-  },
-  "BCSS402": {
-    "username": "BCSS402",
-    "roles": [
-      "Hub Manager"
-    ]
-  },
-  "BCSS33": {
-    "username": "BCSS33",
-    "roles": [
-      "BCSS Bureau Staff"
-    ]
-  },
-  "BCSS406": {
-    "username": "BCSS406",
-    "roles": [
-      "Assistant Laboratory Lead - state registered"
-    ]
   }
-}
+}