Fixing type checker errors

Author: adrianoaru-nhs

pages/call_and_recall/generate_invitations_page.py

@@ -65,6 +65,9 @@ def wait_for_invitation_generation_complete(
             elapsed < timeout
         ):  # there may be a stored procedure to speed this process up
             table_text = self.display_rs.text_content()
+            if table_text is None:
+                pytest.fail("Failed to retrieve table text content")
+
             if "Failed" in table_text:
                 pytest.fail("Invitation has failed to generate")
             elif "Queued" in table_text or "In Progress" in table_text:
@@ -83,15 +86,19 @@ def wait_for_invitation_generation_complete(
         except Exception as e:
             pytest.fail(f"Invitations not generated successfully: {str(e)}")
 
-        value = (
-            self.planned_invitations_total.text_content().strip()
-        )  # Get text and remove extra spaces
+        value = self.planned_invitations_total.text_content()
+        if value is None:
+            pytest.fail("Failed to retrieve planned invitations total")
+        value = value.strip()  # Get text and remove extra spaces
         if int(value) < number_of_invitations:
             pytest.fail(
                 f"There are less than {number_of_invitations} invitations generated"
             )
 
-        self_referrals_total = int(self.self_referrals_total.text_content().strip())
+        self_referrals_total_text = self.self_referrals_total.text_content()
+        if self_referrals_total_text is None:
+            pytest.fail("Failed to retrieve self-referrals total")
+        self_referrals_total = int(self_referrals_total_text.strip())
         if self_referrals_total >= 1:
             return True
         else:

pages/login/login_page.py

@@ -27,6 +27,8 @@ def login_as_user(self, username: str) -> None:
         self.username.fill(user_details["username"])
         # Retrieve and enter password from .env file
         password = os.getenv("BCSS_PASS")
+        if password is None:
+            raise ValueError("Environment variable 'BCSS_PASS' is not set")
         self.password.fill(password)
         # Click Submit
         self.click(self.submit_button)

pages/screening_practitioner_appointments/book_appointment_page.py

@@ -10,12 +10,12 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # Book Appointment - page locators
-        self.screening_center_dropdown = page.locator("#UI_NEW_SCREENING_CENTRE")
-        self.site_dropdown = page.locator("#UI_NEW_SITE")
-        self.appointment_time_radio_button = page.locator(
-            page.get_by_role("radio", name="UI_NEW_SLOT_SELECTION_ID")
+        self.screening_center_dropdown = self.page.locator("#UI_NEW_SCREENING_CENTRE")
+        self.site_dropdown = self.page.locator("#UI_NEW_SITE")
+        self.appointment_time_radio_button = self.page.get_by_role(
+            "radio", name="UI_NEW_SLOT_SELECTION_ID"
         )
-        self.save_button = page.get_by_role("button", name="Save")
+        self.save_button = self.page.get_by_role("button", name="Save")
         self.appointments_table = TableUtils(self.page, "#displayRS")
         self.current_month_displayed = self.page.locator("#MONTH_AND_YEAR")
 
@@ -46,4 +46,7 @@ def appointment_booked_confirmation_is_displayed(self, message: str) -> None:
 
     def get_current_month_displayed(self) -> str:
         """Returns the current month displayed in the calendar."""
-        return self.current_month_displayed.text_content()
+        current_month_displayed_content = self.current_month_displayed.text_content()
+        if current_month_displayed_content is None:
+            raise ValueError("Current month displayed is 'None'")
+        return current_month_displayed_content

pages/screening_subject_search/subject_demographic_page.py

@@ -74,7 +74,9 @@ def fill_dob_input(self, date: datetime) -> None:
         Args:
             date (datetime): The date you want to enter
         """
-        date = CalendarPicker(self.page).calendar_picker_ddmmyyyy(date, self.dob_field)
+        if date is None:
+            raise ValueError("The 'date' argument cannot be None")
+        CalendarPicker(self.page).calendar_picker_ddmmyyyy(date, self.dob_field)
 
     def fill_postcode_input(self, postcode: str) -> None:
         """

pages/screening_subject_search/subject_screening_summary_page.py

@@ -118,7 +118,7 @@ def get_visible_status_from_list(self, latest_event_status) -> Locator:
             locator = self.page.get_by_role("cell", name=status, exact=True)
             if locator.is_visible():
                 return locator
-        logging.error("Unable to find any of the listed statuses")
+        raise ValueError("Unable to find any of the listed statuses")
 
     def click_subjects_events_notes(self) -> None:
         """Click on the 'Subject Events & Notes' link."""

tests/test_home_page_links.py

@@ -3,6 +3,7 @@
 from utils.user_tools import UserTools
 from pages.base_page import BasePage
 from utils.date_time_utils import DateTimeUtils
+import logging
 
 
 @pytest.fixture(scope="function", autouse=True)
@@ -64,10 +65,12 @@ def test_home_page_links_navigation(page: Page) -> None:
         page.get_by_role("link", name="User guide").click()
     # Check that the user guide page can be accessed
     page1 = page1_info.value
+    logging.info(f"User Guide Page: {page1}")
 
     # Click 'help' link
     with page.expect_popup() as page2_info:
         # Check the help link works
         page.get_by_role("link", name="Help").click()
     # Check that the help page can be accessed
     page2 = page2_info.value
+    logging.info(f"Help Page: {page2}")

tests_utils/test_user_tools.py

@@ -6,7 +6,7 @@
 pytestmark = [pytest.mark.utils]
 
 
-def test_retrieve_user(monkeypatch: object) -> None:
+def test_retrieve_user(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(
         utils.user_tools,
         "USERS_FILE",

utils/batch_processing.py

@@ -79,6 +79,9 @@ def batch_processing(
 
     check_batch_in_archived_batch_list(page, link_text)
 
+    if nhs_no_df is None:
+        pytest.fail("No NHS numbers were retrieved for the batch")
+
     for subject in range(len(nhs_no_df)):
         nhs_no = nhs_no_df["subject_nhs_number"].iloc[subject]
         logging.info(f"Verifying the event status for subject: {nhs_no}")

utils/calendar_picker.py

@@ -345,9 +345,9 @@ def v2_calendar_picker(self, date: datetime) -> None:
             click_year,
             click_decade,
             click_century,
-            century,
-            decade,
-            year,
+            str(century),
+            str(decade),
+            str(year),
             month_short,
         )
 
@@ -444,6 +444,7 @@ def check_for_eligible_appointment_dates(
 
             if background_colour in bg_colours:
                 value = locator_element.get_attribute("name")
-                if len(value) < 5:
+                if value is not None and len(value) < 5:
                     self.click(locator.nth(i))
                     return True
+        return False

utils/fit_kit.py

@@ -141,7 +141,7 @@ def process_kit_data(self, smokescreen_properties: dict) -> list:
 
     def split_fit_kits(
         self, kit_id_df: pd.DataFrame, smokescreen_properties: dict
-    ) -> pd.DataFrame:
+    ) -> tuple[pd.DataFrame, pd.DataFrame]:
         """
         This method splits the dataframe into two, 1 normal and 1 abnormal
         """