Completed compartment 2

Fixed some issues in the POMs
Altered the log in logic to match Andy's change

Author: adrianoaru-nhs

pages/fit_test_kits_page.py

@@ -19,43 +19,32 @@ def __init__(self, page: Page):
     def go_to_fit_rollout_summary_page(self):
         self.fit_rollout_summary_page.click()
 
-
     def go_to_log_devices_page(self):
-        self.log_in_page.click()
-
+        self.log_devices_page.click()
 
     def go_to_view_fit_kit_result(self):
         self.view_fit_kit_result_page.click()
 
-
     def go_to_kit_service_management(self):
         self.kit_service_management_page.click()
 
-
     def go_to_kit_result_audit(self):
         self.kit_result_audit_page.click()
 
-
     def go_to_view_algorithm(self):
         self.view_algorithm_page.click()
 
-
     def go_to_view_screening_centre_fit(self):
         self.view_screening_centre_fit_page.click()
 
-
     def go_to_screening_incidents_list(self):
         self.screening_incidents_list_page.click()
 
-
     def go_to_manage_qc_products(self):
         self.manage_qc_products_page.click()
 
-
     def go_to_maintain_analysers(self):
         self.maintain_analysers_page.click()
 
     def go_to_fit_device_id(self):
             self.fit_device_id.enter()
-
-

pages/log_device.py

@@ -0,0 +1,38 @@
+from playwright.sync_api import Page, expect
+
+class LogDevices:
+    def __init__(self, page: Page):
+        self.page = page
+        # Log Devices - page links
+        self.fit_device_id_field = self.page.get_by_role("textbox", name="FIT Device ID")
+        self.save_and_log_device_button = self.page.get_by_role("button", name="Save and Log Device")
+        self.device_spoilt_button = self.page.get_by_role("button", name="Device Spoilt")
+        self.sample_date_field = self.page.locator("#sampleDate")
+        self.successfully_logged_device_text = self.page.get_by_text("×Successfully logged device")
+        self.spoilt_device_dropdown = self.page.get_by_label("Spoil reason drop down")
+        self.log_as_spoilt_button = self.page.get_by_role("button", name="Log as Spoilt")
+
+    def fill_fit_device_id_field(self, value):
+        self.fit_device_id_field.click()
+        self.fit_device_id_field.fill(value)
+        self.fit_device_id_field.press("Enter")
+
+    def click_save_and_log_device_button(self):
+        self.save_and_log_device_button.click()
+
+    def click_device_spoilt_button(self):
+        self.device_spoilt_button.click()
+
+    def fill_sample_date_field(self, value):
+        self.sample_date_field.click()
+        self.sample_date_field.fill(value)
+        self.sample_date_field.press("Enter")
+
+    def verify_successfully_logged_device_text(self):
+        expect(self.successfully_logged_device_text).to_be_visible()
+
+    def select_spoilt_device_dropdown_option(self):
+        self.spoilt_device_dropdown.select_option("205156")
+
+    def click_log_as_spoilt_button(self):
+        self.log_as_spoilt_button.click()

pages/log_devices_page.py

@@ -4,6 +4,7 @@
 from utils.user_tools import UserTools
 from dotenv import load_dotenv
 
+
 class BcssLoginPage:
 
     def __init__(self, page: Page):
@@ -12,40 +13,18 @@ def __init__(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")
+        load_dotenv()  # Take environment variables from .env
 
-
-    def login(self, username, password):
+    def login_as_user(self, username: str) -> None:
         """Logs in to bcss with specified user credentials
         Args:
-            username (str) enter a username
-            password (str) enter a password
+            username (str) enter a username that exists in users.json
         """
-        self.username.fill(username)
-        self.password.fill(password)
-        self.submit_button.click()
-
-    def login_as_user_bcss401(self):
-        """Logs in to bcss as the test user 'BCSS401'"""
-        # Take environment variables from .env
-        load_dotenv()
-        # Retrieve and enter username from users.json
-        user_details = UserTools.retrieve_user("BCSS401")
-        self.username.fill(user_details["username"])
-        # Retrieve and enter password from .env file
-        password = os.getenv("BCSS_PASS")
-        self.password.fill(password)
-        # Click submit button
-        self.submit_button.click()
-
-    def login_as_user_bcss118(self):
-        """Logs in to bcss as the test user 'BCSS118'"""
-        # Take environment variables from .env
-        load_dotenv()
         # Retrieve and enter username from users.json
-        user_details = UserTools.retrieve_user("BCSS118")
+        user_details = UserTools.retrieve_user(username)
         self.username.fill(user_details["username"])
         # Retrieve and enter password from .env file
         password = os.getenv("BCSS_PASS")
         self.password.fill(password)
-        # Click submit button
+        # Click Submit
         self.submit_button.click()

pages/login_page.py

@@ -4,7 +4,6 @@ pytest-json-report>=1.5.0
 pypdf>=5.3.0
 oracledb>=2.5.1
 pandas>=2.2.3
-dotenv~=0.9.9
 python-dotenv~=1.0.1
 Flask~=3.0.3
 fastparquet>=2024.11.0

requirements.txt

@@ -13,4 +13,5 @@
 from pages.invitations_plans_page import *
 from pages.generate_invitations_page import *
 from pages.fit_test_kits_page import *
+from pages.log_devices_page import *
 from pages.log_out_page import *

tests/Smokescreen/my_pages.py

@@ -9,9 +9,9 @@
 # playwright._impl._errors.Error: Dialog.accept: Cannot accept dialog which is already handled! - Have a look at removing this error (probably from line 67 of batch_processing)
 
 @pytest.mark.wip
-def test_example(page: Page) -> None:
+def test_compartment_1(page: Page) -> None:
     page.goto("/")
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Create plan
     MainMenu(page).go_to_call_and_recall_page()

tests/Smokescreen/test_compartment_1.py

@@ -7,19 +7,21 @@
 import pandas as pd
 
 @pytest.mark.wip1
-def test_example(page: Page) -> None:
+def test_compartment_2(page: Page) -> None:
     page.goto("/")
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     MainMenu(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()
     subjectdf = pd.read_parquet('subject_kit_number.parquet', engine='fastparquet')
+    os.remove('subject_kit_number.parquet')
+
     for subject in range(4):
         fit_device_id = subjectdf["FIT_Device_ID"].iloc[subject-1]
-        # log devices - fill device id field with fit_device_id
+        LogDevices(page).fill_fit_device_id_field(fit_device_id)
         sample_date = datetime.now().strftime("%#d %b %Y")
-        # log devices - fill sample date field with sample_date
-        # log devices - verify successfully logged device
+        LogDevices(page).fill_sample_date_field(sample_date)
+        LogDevices(page).verify_successfully_logged_device_text()
 
     nhs_no = subjectdf["NHS_Number"].iloc[0]
     verify_subject_event_status_by_nhs_no(page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)")
@@ -28,10 +30,15 @@ def test_example(page: Page) -> None:
     MainMenu(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()
     spoilt_fit_device_id = subjectdf["FIT_Device_ID"].iloc[4]
-    # log devices - fill device id field with spoilt_fit_device_id
-    # log devices - click device spoilt button
-    # log devices - select option from dropdown
-    # log devices - click log as spoilt button
-    # log devices = verify successfully logged device
+    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()
 
     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()

tests/Smokescreen/test_compartment_2.py

@@ -11,7 +11,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the bowel scope page
     """
     # Log in to BCSS
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to bowel scope page
     MainMenu(page).go_to_bowel_scope_page()

tests/test_bowel_scope_page.py

@@ -11,7 +11,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the call and recall page
     """
     # Log in to BCSS
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to call and recall page
     MainMenu(page).go_to_call_and_recall_page()