Completing Scenario 9

Altering click method to do less checks
Fixing spelling mistakes

Author: adrianoaru-nhs

pages/base_page.py

@@ -219,10 +219,7 @@ def click(self, locator: Locator) -> None:
             alerts_table.wait_for(state="visible")
 
         try:
-            self.page.wait_for_load_state("load")
             self.page.wait_for_load_state("domcontentloaded")
-            self.page.wait_for_load_state("networkidle")
-            locator.wait_for(state="attached")
             locator.wait_for(state="visible")
             locator.click()
 

pages/screening_subject_search/advance_episode_page.py

@@ -31,6 +31,9 @@ def __init__(self, page: Page):
         )
         self.calendar_button = self.page.get_by_role("button", name="Calendar")
         self.test_type_dropdown = self.page.locator("[id^='UI_EXT_TEST_TYPE_']")
+        self.intended_extent_dropdown = self.page.locator(
+            "[id^='UI_INTENDED_EXTENT_TYPE_']"
+        )
         self.advance_checkbox_label = self.page.get_by_label(
             "There are some events available which should only be used in exceptional circumstances. If you wish to see them, check this box"
         )
@@ -178,6 +181,10 @@ def select_test_type_dropdown_option(self, text: str) -> None:
         """Select the test type from the dropdown."""
         self.test_type_dropdown.select_option(label=text)
 
+    def select_intended_extent_dropdown_option(self, text: str) -> None:
+        """Select the intended extent from the dropdown."""
+        self.intended_extent_dropdown.select_option(label=text)
+
     def click_invite_for_diagnostic_test_button(self) -> None:
         """Click the 'Invite for Diagnostic Test' button."""
         self.safe_accept_dialog(self.invite_for_diagnostic_test_button)

pages/screening_subject_search/subject_screening_summary_page.py

@@ -59,7 +59,7 @@ def __init__(self, page: Page):
         self.first_fobt_episode_link = self.page.get_by_role(
             "link", name="FOBT Screening"
         ).first
-        self.first_surveillance_epsiode_link = self.page.get_by_role(
+        self.first_surveillance_episode_link = self.page.get_by_role(
             "link", name="Surveillance"
         ).first
         self.datasets_link = self.page.get_by_role("link", name="Datasets")
@@ -244,9 +244,9 @@ def click_first_fobt_episode_link(self) -> None:
         """Click on the first FOBT episode link."""
         self.click(self.first_fobt_episode_link)
 
-    def click_first_surveillance_epsiode_link(self) -> None:
+    def click_first_surveillance_episode_link(self) -> None:
         """Click on the first Surveillance episode link."""
-        self.click(self.first_surveillance_epsiode_link)
+        self.click(self.first_surveillance_episode_link)
 
     def click_datasets_link(self) -> None:
         """Click on the 'Datasets' link."""

tests/regression/regression_tests/surveillance_regression_tests/test_surveillance_scenario_1.py

@@ -280,7 +280,7 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
 
     # And I view the event history for the subject's latest episode
     SubjectScreeningSummaryPage(page).expand_episodes_list()
-    SubjectScreeningSummaryPage(page).click_first_surveillance_epsiode_link()
+    SubjectScreeningSummaryPage(page).click_first_surveillance_episode_link()
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
 
@@ -437,7 +437,7 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
     # And I view the event history for the subject's latest episode
     SubjectScreeningSummaryPage(page).expand_episodes_list()
-    SubjectScreeningSummaryPage(page).click_first_surveillance_epsiode_link()
+    SubjectScreeningSummaryPage(page).click_first_surveillance_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
@@ -480,7 +480,7 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
     # And I view the event history for the subject's latest episode
     SubjectScreeningSummaryPage(page).expand_episodes_list()
-    SubjectScreeningSummaryPage(page).click_first_surveillance_epsiode_link()
+    SubjectScreeningSummaryPage(page).click_first_surveillance_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()

tests/regression/regression_tests/surveillance_regression_tests/test_surveillance_scenario_2.py

@@ -163,7 +163,7 @@ def test_scenario_2(page: Page, general_properties: dict) -> None:
 
     # And I view the event history for the subject's latest episode
     SubjectScreeningSummaryPage(page).expand_episodes_list()
-    SubjectScreeningSummaryPage(page).click_first_surveillance_epsiode_link()
+    SubjectScreeningSummaryPage(page).click_first_surveillance_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
@@ -227,7 +227,7 @@ def test_scenario_2(page: Page, general_properties: dict) -> None:
 
     # And I view the event history for the subject's latest episode
     SubjectScreeningSummaryPage(page).expand_episodes_list()
-    SubjectScreeningSummaryPage(page).click_first_surveillance_epsiode_link()
+    SubjectScreeningSummaryPage(page).click_first_surveillance_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
@@ -404,7 +404,7 @@ def test_scenario_2(page: Page, general_properties: dict) -> None:
 
     # And I view the event history for the subject's latest episode
     SubjectScreeningSummaryPage(page).expand_episodes_list()
-    SubjectScreeningSummaryPage(page).click_first_surveillance_epsiode_link()
+    SubjectScreeningSummaryPage(page).click_first_surveillance_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()