Addressed PR comments

Author: Andyg79

pages/screening_practitioner_appointments/subject_datasets.py

@@ -8,9 +8,7 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
 
-        self.show_dataset_button = self.page.get_by_role(
-            "link", name="Show Dataset"
-        ).click()
+        self.show_dataset_button = self.page.get_by_role("link", name="Show Dataset")
 
         self.save_dataset_button = self.page.locator(
             "#UI_DIV_BUTTON_SAVE1"
@@ -34,7 +32,7 @@ def click_show_datasets(self) -> None:
         self.click(self.show_dataset_button)
 
     def save_dataset(self) -> None:
-        self.save_dataset_button.click()
+        self.click(self.save_dataset_button)
 
     def select_asa_grade_option(self, option: str) -> None:
         self.select_asa_grade_dropdowen.select_option(option)
@@ -44,11 +42,9 @@ def select_fit_for_colonoscopy_option(self, option: str) -> None:
 
     def click_dataset_complete_radio_button_yes(self) -> None:
         self.dataset_complete_radio_button_yes.check()
-        expect(self.dataset_complete_radio_button_yes).to_be_checked()
 
     def click_dataset_complete_radio_button_no(self) -> None:
         self.dataset_complete_radio_button_no.check()
-        expect(self.dataset_complete_radio_button_no).not_to_be_checked()
 
 
 class AsaGradeOptions(Enum):

tests/smokescreen/test_compartment_5.py

@@ -6,6 +6,7 @@
     ScreeningPractitionerAppointmentsPage,
     subject_datasets,
 )
+from pages.screening_subject_search import FitForColonoscopySspOptions, AsaGradeOptions
 from pages.screening_subject_search.subject_screening_summary import (
     SubjectScreeningSummary,
 )
@@ -96,13 +97,15 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     subject_datasets(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
 
     # Fit for Colonoscopy (SSP) - Yes
-    subject_datasets(page).select_fit_for_colonoscopy_option(FitForColonoscopySspOptions.YES.value)
+    subject_datasets(page).select_fit_for_colonoscopy_option(
+        FitForColonoscopySspOptions.YES.value
+    )
 
     # Click 'Yes' for Dataset Complete?
     subject_datasets(page).click_dataset_complete_radio_button_yes()
 
     # Click Save Dataset button
-    subject_datasets(page).save_dataset().click()
+    subject_datasets(page).save_dataset()
 
     # Click Back
     BasePage(page).click_back_button()