diff --git a/mavis/test/fixtures/helpers.py b/mavis/test/fixtures/helpers.py index 9dc18494fd2..bc03bbf8659 100644 --- a/mavis/test/fixtures/helpers.py +++ b/mavis/test/fixtures/helpers.py @@ -31,7 +31,7 @@ def wrapper(vaccine: Vaccine, batch_name: str = "ABC123"): vaccines_page.navigate() vaccines_page.click_add_batch(vaccine) add_batch_page.fill_name(batch_name) - add_batch_page.fill_expiry_date(get_offset_date(1)) + add_batch_page.date.fill_expiry_date(get_offset_date(1)) add_batch_page.confirm() return batch_name @@ -193,7 +193,7 @@ def wrapper( dashboard_page.click_mavis() dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(programme) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.search_for_child(child) programme_children_page.click_child(child) child_record_page.click_vaccination_details(programme) diff --git a/mavis/test/fixtures/pages.py b/mavis/test/fixtures/pages.py index bcaf99d2b1d..86d6f70eb63 100644 --- a/mavis/test/fixtures/pages.py +++ b/mavis/test/fixtures/pages.py @@ -168,8 +168,8 @@ def programmes_list_page(page: Page) -> ProgrammesListPage: @pytest.fixture -def programme_overview_page(page: Page, test_data: TestData) -> ProgrammeOverviewPage: - return ProgrammeOverviewPage(page, test_data) +def programme_overview_page(page: Page) -> ProgrammeOverviewPage: + return ProgrammeOverviewPage(page) @pytest.fixture diff --git a/mavis/test/pages/children.py b/mavis/test/pages/children.py index 38727a69cfc..2141bb20489 100644 --- a/mavis/test/pages/children.py +++ b/mavis/test/pages/children.py @@ -117,7 +117,7 @@ def check_children_aged_out_of_programmes(self) -> None: self.children_aged_out_of_programmes_checkbox.check() -class ChildRecordTabsMixin: +class ChildRecordTabs: def __init__(self, page: Page) -> None: self.page = page self.child_record_tab = page.get_by_role("link", name="Child record") @@ -129,9 +129,10 @@ def click_activity_log(self) -> None: self.activity_log_tab.get_by_role("strong").wait_for() -class ChildRecordPage(ChildRecordTabsMixin): +class ChildRecordPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = ChildRecordTabs(page) vaccinations_card = page.locator("section").filter( has=page.get_by_role("heading", name="Vaccinations"), @@ -270,9 +271,10 @@ def archive_child_record(self) -> None: expect(self.page.get_by_text("Archive reason")).to_be_visible() -class ChildActivityLogPage(ChildRecordTabsMixin): +class ChildActivityLogPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = ChildRecordTabs(page) self.manually_matched_card = self.page.get_by_text( "Consent response manually matched with child record", ) diff --git a/mavis/test/pages/programmes.py b/mavis/test/pages/programmes.py index f49d5379a81..8406d88c7cc 100644 --- a/mavis/test/pages/programmes.py +++ b/mavis/test/pages/programmes.py @@ -5,7 +5,6 @@ from playwright.sync_api import Page from mavis.test.annotations import step -from mavis.test.data import TestData from mavis.test.models import Child, DeliverySite, Programme, ReportFormat from mavis.test.utils import get_current_datetime_compact @@ -24,7 +23,7 @@ def click_programme_for_current_year(self, programme: Programme) -> None: self.current_year_programmes_card.get_by_role("link", name=programme).click() -class ProgrammeTabsMixin: +class ProgrammeTabs: def __init__(self, page: Page) -> None: self.page = page self.children_tab = page.get_by_label("Secondary menu").get_by_role( @@ -45,11 +44,10 @@ def click_sessions_tab(self) -> None: self.sessions_tab.get_by_role("strong").wait_for() -class ProgrammeOverviewPage(ProgrammeTabsMixin): - def __init__(self, page: Page, test_data: TestData) -> None: - super().__init__(page) +class ProgrammeOverviewPage: + def __init__(self, page: Page) -> None: self.page = page - self.test_data = test_data + self.tabs = ProgrammeTabs(page) self.review_link = page.get_by_role("link", name="Review") self.edit_vaccination_record_button = page.get_by_role( @@ -171,14 +169,17 @@ def _download_and_verify_report_headers(self, expected_headers: str) -> None: raise AssertionError(error_message) -class ProgrammeSessionsPage(ProgrammeTabsMixin): +class ProgrammeSessionsPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = ProgrammeTabs(page) -class ProgrammeChildrenPage(ProgrammeTabsMixin): +class ProgrammeChildrenPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = ProgrammeTabs(page) + self.import_child_records_link = page.get_by_text("Import child records") self.search_textbox = page.get_by_role("textbox", name="Search") self.search_button = page.get_by_role("button", name="Search") diff --git a/mavis/test/pages/reports.py b/mavis/test/pages/reports.py index accf323ced8..d9760963a72 100644 --- a/mavis/test/pages/reports.py +++ b/mavis/test/pages/reports.py @@ -14,7 +14,7 @@ ) -class ReportsTabsMixin: +class ReportsTabs: def __init__(self, page: Page) -> None: self.page = page self.vaccinations_tab = page.get_by_label("Secondary menu").get_by_role( @@ -35,9 +35,11 @@ def click_download_data_tab(self) -> None: self.download_data_tab.get_by_role("strong").wait_for() -class ReportsVaccinationsPage(ReportsTabsMixin): +class ReportsVaccinationsPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = ReportsTabs(page) + self.cohort_heading = self.page.get_by_role( "heading", name="Cohort", exact=True ) @@ -109,9 +111,11 @@ def get_expected_cohort_and_percentage_strings( return str(total), str(unvaccinated_pct), str(vaccinated_pct) -class ReportsDownloadPage(ReportsTabsMixin): +class ReportsDownloadPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = ReportsTabs(page) + self.aggregate_data_radio = self.page.get_by_role( "radio", name="Aggregate vaccination data" ) diff --git a/mavis/test/pages/sessions.py b/mavis/test/pages/sessions.py index 20629eaadbb..698fb871926 100644 --- a/mavis/test/pages/sessions.py +++ b/mavis/test/pages/sessions.py @@ -30,7 +30,7 @@ ) -class SearchBarMixin: +class SearchComponent: def __init__( self, page: Page, @@ -48,7 +48,7 @@ def __init__( name="Archived records", ) - def _get_patient_card_locator(self, child: Child) -> Locator: + def get_patient_card_locator(self, child: Child) -> Locator: return self.page.locator( f'div.nhsuk-card.app-card.app-card--compact:has(h4:has-text("{child!s}"))' ) @@ -70,7 +70,7 @@ def verify_search(self) -> None: def search_and_click_child(self, child: Child) -> None: self.search_for(str(child)) - child_locator = self._get_patient_card_locator(child).get_by_role( + child_locator = self.get_patient_card_locator(child).get_by_role( "link", name=str(child) ) reload_until_element_is_visible(self.page, child_locator) @@ -78,7 +78,7 @@ def search_and_click_child(self, child: Child) -> None: def search_for_child_that_should_not_exist(self, child: Child) -> None: self.search_for(str(child)) - child_locator = self._get_patient_card_locator(child).get_by_role( + child_locator = self.get_patient_card_locator(child).get_by_role( "link", name=str(child) ) expect(child_locator).not_to_be_visible() @@ -112,7 +112,7 @@ def check_note_appears_in_search(self, child: Child, note: str) -> None: expect(next_element.get_by_role("blockquote")).to_have_text(note) -class SessionsTabsMixin: +class SessionsTabs: def __init__( self, page: Page, @@ -146,14 +146,12 @@ def click_record_vaccinations_tab(self) -> None: def click_children_tab(self) -> None: self._select_tab("Children") - @step("Click on Triage tab") - def click_triage_tab(self) -> None: - self._select_tab("Triage") - -class SessionsPsdPage(SearchBarMixin, SessionsTabsMixin): +class SessionsPsdPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.search = SearchComponent(page) + self.tabs = SessionsTabs(page) self.add_new_psds_link = self.page.get_by_role( "link", @@ -166,16 +164,16 @@ def __init__(self, page: Page) -> None: @step("Check {1} has PSD") def check_child_has_psd(self, child: Child) -> None: - child_with_psd_locator = self._get_patient_card_locator(child).get_by_text( - "PSD added" - ) + child_with_psd_locator = self.search.get_patient_card_locator( + child + ).get_by_text("PSD added") reload_until_element_is_visible(self.page, child_with_psd_locator) @step("Check {1} does not have PSD") def check_child_does_not_have_psd(self, child: Child) -> None: - child_without_psd_locator = self._get_patient_card_locator(child).get_by_text( - "PSD not added" - ) + child_without_psd_locator = self.search.get_patient_card_locator( + child + ).get_by_text("PSD not added") reload_until_element_is_visible(self.page, child_without_psd_locator) @step("Click Add new PSDs") @@ -194,9 +192,10 @@ def verify_psd_banner_has_patients(self, number_of_patients: int) -> None: reload_until_element_is_visible(self.page, psd_banner) -class SessionsSearchPage(SearchBarMixin): +class SessionsSearchPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.search = SearchComponent(page) @step("Click on {2} session at {1}") def click_session_for_programme_group( @@ -209,8 +208,8 @@ def click_session_for_programme_group( else: self.page.get_by_role("checkbox", name=str(programme)).uncheck() - self.search_textbox.fill(str(location)) - self.search_button.click() + self.search.search_textbox.fill(str(location)) + self.search.search_button.click() self.page.get_by_role("link", name=str(location)).first.click() @@ -221,9 +220,11 @@ def click_session_for_programme_group( ) -class SessionsOverviewPage(SessionsTabsMixin): +class SessionsOverviewPage: def __init__(self, page: Page) -> None: self.page = page + self.tabs = SessionsTabs(page) + self.schedule_sessions_link = self.page.get_by_role( "link", name="Schedule sessions", @@ -265,7 +266,7 @@ def get_all_totals(self, programme: Programme) -> dict[str, int]: } def check_all_totals(self, totals: dict[str, int]) -> None: - self.click_overview_tab() + self.tabs.click_overview_tab() for category, expected_total in totals.items(): actual_total = self.get_total_for_category(category) assert actual_total == expected_total, ( @@ -597,9 +598,12 @@ def answer_whether_psd_should_be_enabled(self, answer: str) -> None: ).get_by_label(answer).check() -class SessionsChildrenPage(SearchBarMixin, SessionsTabsMixin): +class SessionsChildrenPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = SessionsTabs(page) + self.search = SearchComponent(page) + self.needs_consent_radio = self.page.get_by_role( "radio", name="Needs consent", @@ -657,7 +661,7 @@ def verify_child_shows_correct_flu_consent_method( reload_until_element_is_visible(self.page, method_locator) def get_flu_consent_status_locator_from_search(self, child: Child) -> Locator: - child_locator = self._get_patient_card_locator(child) + child_locator = self.search.get_patient_card_locator(child) flu_consent_section = child_locator.locator("p:has-text('Flu')") reload_until_element_is_visible(self.page, flu_consent_section) @@ -668,14 +672,17 @@ def expect_has_a_refusal_to_be_selected(self) -> None: expect(self.has_a_refusal_radio).to_be_checked() -class SessionsRegisterPage(SearchBarMixin, SessionsTabsMixin): +class SessionsRegisterPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = SessionsTabs(page) + self.search = SearchComponent(page) + self.attending_button = self.page.get_by_role("button", name="Attending").first def register_child_as_attending(self, child: Child) -> None: - self.click_register_tab() - self.search_for(str(child)) + self.tabs.click_register_tab() + self.search.search_for(str(child)) reload_until_element_is_visible( self.page, self.page.get_by_role("link", name=str(child)).first ) @@ -686,9 +693,11 @@ def click_on_attending(self) -> None: self.attending_button.click() -class SessionsRecordVaccinationsPage(SearchBarMixin, SessionsTabsMixin): +class SessionsRecordVaccinationsPage: def __init__(self, page: Page) -> None: - super().__init__(page) + self.page = page + self.tabs = SessionsTabs(page) + self.search = SearchComponent(page) class SessionsPatientPage: diff --git a/mavis/test/pages/vaccines.py b/mavis/test/pages/vaccines.py index b2187446c22..06ea947d080 100644 --- a/mavis/test/pages/vaccines.py +++ b/mavis/test/pages/vaccines.py @@ -6,7 +6,7 @@ from mavis.test.models import Vaccine -class BatchExpiryDateMixin: +class BatchExpiryDate: def __init__(self, page: Page) -> None: self.expiry_day_textbox = page.get_by_role("textbox", name="Day") self.expiry_month_textbox = page.get_by_role("textbox", name="Month") @@ -19,11 +19,10 @@ def fill_expiry_date(self, value: date) -> None: self.expiry_year_textbox.fill(str(value.year)) -class AddBatchPage(BatchExpiryDateMixin): +class AddBatchPage: def __init__(self, page: Page) -> None: - super().__init__(page) - self.page = page + self.date = BatchExpiryDate(page) self.name_textbox = page.get_by_role("textbox", name="Batch") self.confirm_button = page.get_by_role("button", name="Add batch") @@ -43,11 +42,10 @@ def confirm(self) -> None: self.confirm_button.click() -class EditBatchPage(BatchExpiryDateMixin): +class EditBatchPage: def __init__(self, page: Page) -> None: - super().__init__(page) - self.page = page + self.date = BatchExpiryDate(page) self.confirm_button = page.get_by_role("button", name="Save changes") self.success_alert = page.get_by_role("alert", name="Success").filter( diff --git a/tests/test_children.py b/tests/test_children.py index 39bae6fe5df..d4574439615 100644 --- a/tests/test_children.py +++ b/tests/test_children.py @@ -86,7 +86,7 @@ def setup_mav_853( dashboard_page.click_mavis() dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.HPV) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.click_import_child_records() import_records_wizard_page.import_class_list(CohortsFileMapping.FIXED_CHILD) dashboard_page.click_mavis() @@ -132,7 +132,7 @@ def test_patient_details_load_with_missing_vaccine_info( children_search_page.search_with_all_filters_for_child_name(str(child)) children_search_page.click_record_for_child(child) # Verify activity log - child_record_page.click_activity_log() + child_record_page.tabs.click_activity_log() child_activity_log_page.expect_activity_log_header( "Vaccinated with Gardasil 9", unique=True ) @@ -227,5 +227,5 @@ def test_accessibility( children_search_page.click_record_for_child(child) accessibility_helper.check_accessibility() - child_record_page.click_activity_log() + child_record_page.tabs.click_activity_log() accessibility_helper.check_accessibility() diff --git a/tests/test_consent_responses.py b/tests/test_consent_responses.py index adc6a7e5a3d..d6127793170 100644 --- a/tests/test_consent_responses.py +++ b/tests/test_consent_responses.py @@ -128,7 +128,7 @@ def test_match_unmatched_consent_response_and_verify_activity_log( dashboard_page.click_mavis() dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.HPV) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.click_import_child_records() import_records_wizard_page.import_class_list(CohortsFileMapping.FIXED_CHILD) @@ -147,7 +147,7 @@ def test_match_unmatched_consent_response_and_verify_activity_log( dashboard_page.click_children() children_search_page.search_with_all_filters_for_child_name(str(child)) children_search_page.click_record_for_child(child) - child_record_page.click_activity_log() + child_record_page.tabs.click_activity_log() child_activity_log_page.verify_activity_log_for_created_or_matched_child() @@ -189,7 +189,7 @@ def test_create_child_record_from_consent_with_nhs_number( dashboard_page.click_children() children_search_page.search_with_all_filters_for_child_name(str(child)) children_search_page.click_record_for_child(child) - child_record_page.click_activity_log() + child_record_page.tabs.click_activity_log() child_activity_log_page.verify_activity_log_for_created_or_matched_child() @@ -231,7 +231,7 @@ def test_create_child_record_from_consent_without_nhs_number( dashboard_page.click_children() children_search_page.search_with_all_filters_for_child_name(str(child)) children_search_page.click_record_for_child(child) - child_record_page.click_activity_log() + child_record_page.tabs.click_activity_log() child_activity_log_page.verify_activity_log_for_created_or_matched_child() @@ -263,7 +263,7 @@ def test_accessibility( dashboard_page.click_mavis() dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.HPV) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.click_import_child_records() import_records_wizard_page.import_class_list(CohortsFileMapping.FIXED_CHILD) @@ -322,7 +322,7 @@ def test_match_consent_with_vaccination_record_no_service_error( dashboard_page.click_mavis() dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.HPV) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.click_import_child_records() import_records_wizard_page.import_class_list(ClassFileMapping.TWO_FIXED_CHILDREN) diff --git a/tests/test_e2e_doubles.py b/tests/test_e2e_doubles.py index b3a11ca3b25..586c0f3aa1d 100644 --- a/tests/test_e2e_doubles.py +++ b/tests/test_e2e_doubles.py @@ -88,10 +88,10 @@ def test_recording_doubles_vaccination_e2e( sessions_search_page.click_session_for_programme_group(schools[0], "doubles") sessions_overview_page.click_set_session_in_progress_for_today() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord( child, Programme.MENACWY, menquadfi_batch_name diff --git a/tests/test_e2e_flu.py b/tests/test_e2e_flu.py index 624ab33d045..552b30176e6 100644 --- a/tests/test_e2e_flu.py +++ b/tests/test_e2e_flu.py @@ -100,10 +100,10 @@ def test_recording_flu_vaccination_e2e( sessions_search_page.click_session_for_programme_group(schools[0], Programme.FLU) sessions_overview_page.click_set_session_in_progress_for_today() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord( child, Programme.FLU, batch_name, consent_option diff --git a/tests/test_e2e_hpv.py b/tests/test_e2e_hpv.py index 9d59d987c6c..d0683bdaf76 100644 --- a/tests/test_e2e_hpv.py +++ b/tests/test_e2e_hpv.py @@ -76,10 +76,10 @@ def test_recording_hpv_vaccination_e2e( sessions_search_page.click_session_for_programme_group(schools[0], Programme.HPV) sessions_overview_page.click_set_session_in_progress_for_today() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord(child, Programme.HPV, gardasil_9_batch_name) sessions_patient_page.set_up_vaccination(vaccination_record) diff --git a/tests/test_e2e_mmr.py b/tests/test_e2e_mmr.py index a15860ae957..a6862c6b0d7 100644 --- a/tests/test_e2e_mmr.py +++ b/tests/test_e2e_mmr.py @@ -80,8 +80,8 @@ def test_recording_mmr_vaccination_e2e_with_triage( # Triage step added for MMR sessions_search_page.click_session_for_programme_group(schools[0], Programme.MMR) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.MMR) sessions_patient_page.triage_mmr_patient(ConsentOption.MMR_EITHER) dashboard_page.navigate() @@ -90,10 +90,10 @@ def test_recording_mmr_vaccination_e2e_with_triage( sessions_search_page.click_session_for_programme_group(schools[0], Programme.MMR) sessions_overview_page.click_set_session_in_progress_for_today() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord(child, Programme.MMR, mmr_batch_name) sessions_patient_page.set_up_vaccination(vaccination_record) @@ -169,10 +169,10 @@ def test_verify_child_cannot_be_vaccinated_twice_for_mmr_on_same_day( # Dose 1 flow sessions_search_page.click_session_for_programme_group(schools[0], Programme.MMR) sessions_overview_page.click_set_session_in_progress_for_today() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord(child, Programme.MMR, mmr_batch_name) sessions_patient_page.set_up_vaccination(vaccination_record) @@ -182,8 +182,10 @@ def test_verify_child_cannot_be_vaccinated_twice_for_mmr_on_same_day( dashboard_page.navigate() dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(schools[0], Programme.MMR) - sessions_overview_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_for_child_that_should_not_exist(child) + sessions_overview_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_for_child_that_should_not_exist( + child + ) dashboard_page.navigate() log_in_page.log_out() @@ -259,8 +261,8 @@ def test_recording_mmr_vaccination_e2e_with_imported_dose_one( # Triage step added for MMR sessions_search_page.click_session_for_programme_group(schools[0], Programme.MMR) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.MMR) sessions_patient_page.triage_mmr_patient(ConsentOption.MMR_EITHER) dashboard_page.navigate() @@ -268,10 +270,10 @@ def test_recording_mmr_vaccination_e2e_with_imported_dose_one( sessions_search_page.click_session_for_programme_group(schools[0], Programme.MMR) sessions_overview_page.click_set_session_in_progress_for_today() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord(child, Programme.MMR, mmr_batch_name) sessions_patient_page.set_up_vaccination(vaccination_record) diff --git a/tests/test_nurse_consent.py b/tests/test_nurse_consent.py index 9efb80f25f1..e098c6b02ea 100644 --- a/tests/test_nurse_consent.py +++ b/tests/test_nurse_consent.py @@ -73,8 +73,8 @@ def test_gillick_competence( school = schools[Programme.HPV][0] sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_assess_gillick_competence() @@ -111,8 +111,8 @@ def test_gillick_competence_notes( school = schools[Programme.HPV][0] sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_assess_gillick_competence() @@ -162,9 +162,9 @@ def test_invalid_consent( school = schools[Programme.HPV][0] sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_needs_consent() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() @@ -174,7 +174,7 @@ def test_invalid_consent( sessions_children_page.select_needs_consent() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[1]) @@ -183,7 +183,7 @@ def test_invalid_consent( sessions_children_page.select_has_a_refusal() sessions_children_page.select_parent_refused() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.invalidate_parent_refusal(child.parents[1]) sessions_patient_page.click_session_activity_and_notes() @@ -229,10 +229,10 @@ def test_parent_provides_consent_twice( school = schools[Programme.HPV][0] sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_needs_consent() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[0]) @@ -242,7 +242,7 @@ def test_parent_provides_consent_twice( ) sessions_children_page.select_due_vaccination() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[0]) @@ -252,7 +252,7 @@ def test_parent_provides_consent_twice( sessions_children_page.select_has_a_refusal() sessions_children_page.select_parent_refused() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_vaccination_wizard_page.expect_consent_refused_text(child.parents[0]) sessions_patient_page.click_session_activity_and_notes() @@ -299,9 +299,9 @@ def test_conflicting_consent_with_gillick_consent( school = schools[Programme.HPV][0] sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_needs_consent() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() @@ -310,7 +310,7 @@ def test_conflicting_consent_with_gillick_consent( nurse_consent_wizard_page.record_parent_positive_consent() sessions_children_page.select_due_vaccination() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() @@ -322,7 +322,7 @@ def test_conflicting_consent_with_gillick_consent( sessions_children_page.select_parent_refused() sessions_children_page.select_conflicting_consent() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.expect_consent_status(Programme.HPV, "Conflicting consent") sessions_patient_page.expect_conflicting_consent_text() @@ -335,7 +335,7 @@ def test_conflicting_consent_with_gillick_consent( expect_alert_text(nurse_consent_wizard_page.page, f"Consent recorded for {child!s}") sessions_children_page.select_due_vaccination() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.expect_consent_status(Programme.HPV, "Consent given") sessions_patient_page.click_session_activity_and_notes() @@ -368,10 +368,10 @@ def test_accessibility( dashboard_page.navigate() dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_needs_consent() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() accessibility_helper.check_accessibility() @@ -400,12 +400,12 @@ def test_accessibility( nurse_consent_wizard_page.click_confirm() accessibility_helper.check_accessibility() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() + sessions_register_page.tabs.click_record_vaccinations_tab() accessibility_helper.check_accessibility() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_record_vaccinations_page.search.search_and_click_child(child) accessibility_helper.check_accessibility() sessions_patient_page.confirm_pre_screening_checks(Programme.HPV) diff --git a/tests/test_online_consent_flu.py b/tests/test_online_consent_flu.py index f9844ce26e3..61a2531ad37 100644 --- a/tests/test_online_consent_flu.py +++ b/tests/test_online_consent_flu.py @@ -249,10 +249,10 @@ def test_flu_consent_method_displayed_correctly( dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(schools[0], Programme.FLU) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_due_vaccination() - sessions_children_page.search_for(str(child)) + sessions_children_page.search.search_for(str(child)) sessions_children_page.verify_child_shows_correct_flu_consent_method( child, consents[2] ) diff --git a/tests/test_online_consent_school_moves.py b/tests/test_online_consent_school_moves.py index c2b855bc35b..d652d56f3ff 100644 --- a/tests/test_online_consent_school_moves.py +++ b/tests/test_online_consent_school_moves.py @@ -105,9 +105,9 @@ def test_online_consent_school_moves_with_existing_patient( dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(schools[1], Programme.FLU) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_due_vaccination() - sessions_children_page.search_for(str(child)) + sessions_children_page.search.search_for(str(child)) sessions_children_page.verify_child_shows_correct_flu_consent_method( child, ConsentOption.NASAL_SPRAY_OR_INJECTION ) @@ -178,9 +178,9 @@ def test_online_consent_school_moves_with_new_patient( dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(schools[1], Programme.FLU) - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() sessions_children_page.select_due_vaccination() - sessions_children_page.search_for(str(child)) + sessions_children_page.search.search_for(str(child)) sessions_children_page.verify_child_shows_correct_flu_consent_method( child, ConsentOption.NASAL_SPRAY_OR_INJECTION ) diff --git a/tests/test_programmes.py b/tests/test_programmes.py index 3cb5832ea3b..a0ac7a741a8 100644 --- a/tests/test_programmes.py +++ b/tests/test_programmes.py @@ -16,7 +16,7 @@ def setup_cohort_upload( ): dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.HPV) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.click_import_child_records() @@ -136,7 +136,7 @@ def test_archive_and_unarchive_child_via_cohort_upload( dashboard_page.click_mavis() dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.HPV) - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() programme_children_page.click_import_child_records() import_records_wizard_page.import_class_list(CohortsFileMapping.FIXED_CHILD) @@ -386,8 +386,8 @@ def test_accessibility( dashboard_page.click_programmes() programmes_list_page.click_programme_for_current_year(Programme.FLU) - programme_overview_page.click_sessions_tab() + programme_overview_page.tabs.click_sessions_tab() accessibility_helper.check_accessibility() - programme_overview_page.click_children_tab() + programme_overview_page.tabs.click_children_tab() accessibility_helper.check_accessibility() diff --git a/tests/test_psd.py b/tests/test_psd.py index b683c2561f3..cadda029b94 100644 --- a/tests/test_psd.py +++ b/tests/test_psd.py @@ -118,8 +118,8 @@ def test_delivering_vaccination_after_psd( sessions_edit_page.click_continue_button() sessions_edit_page.click_save_changes() - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.FLU) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[0]) @@ -130,8 +130,8 @@ def test_delivering_vaccination_after_psd( psd_option=True, yes_to_health_questions=True, ) - sessions_overview_page.click_psds_tab() - sessions_psd_page.search_for(str(child)) + sessions_overview_page.tabs.click_psds_tab() + sessions_psd_page.search.search_for(str(child)) sessions_psd_page.check_child_has_psd(child) log_in_page.log_out() @@ -141,10 +141,10 @@ def test_delivering_vaccination_after_psd( dashboard_page.click_mavis() dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(school, Programme.FLU) - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord( child, Programme.FLU, fluenz_batch_name, ConsentOption.NASAL_SPRAY_OR_INJECTION @@ -215,13 +215,13 @@ def test_bulk_adding_psd( sessions_edit_page.click_continue_button() sessions_edit_page.click_save_changes() - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() for child in children[Programme.FLU]: sessions_children_page.get_flu_consent_status_locator_from_search(child) - sessions_children_page.click_psds_tab() + sessions_children_page.tabs.click_psds_tab() for child in children[Programme.FLU]: - sessions_psd_page.search_for(str(child)) + sessions_psd_page.search.search_for(str(child)) sessions_psd_page.check_child_does_not_have_psd(child) sessions_psd_page.verify_psd_banner_has_patients(2) @@ -232,7 +232,7 @@ def test_bulk_adding_psd( sessions_psd_page.verify_psd_banner_has_patients(0) for child in children[Programme.FLU]: - sessions_psd_page.search_for(str(child)) + sessions_psd_page.search.search_for(str(child)) sessions_psd_page.check_child_has_psd(child) @@ -271,7 +271,7 @@ def test_accessibility( sessions_edit_page.answer_whether_psd_should_be_enabled("Yes") sessions_edit_page.click_continue_button() sessions_edit_page.click_save_changes() - sessions_overview_page.click_psds_tab() + sessions_overview_page.tabs.click_psds_tab() accessibility_helper.check_accessibility() sessions_psd_page.click_add_new_psds() diff --git a/tests/test_reset.py b/tests/test_reset.py index b37ebf5c64b..cfe3821262b 100644 --- a/tests/test_reset.py +++ b/tests/test_reset.py @@ -97,10 +97,10 @@ def test_pre_screening_questions_prefilled_for_multiple_vaccinations( dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(school, programme_group) if programme_group is Programme.HPV: - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_register_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) programmes = ( [Programme.MENACWY, Programme.TD_IPV] if programme_group == "doubles" @@ -128,7 +128,7 @@ def test_pre_screening_questions_prefilled_for_multiple_vaccinations( target_length=MAVIS_NOTE_LENGTH_LIMIT + 1, generate_spaced_words=True, ) - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.set_up_vaccination(vaccination_record, notes=notes) sessions_vaccination_wizard_page.record_vaccination( vaccination_record, notes=notes diff --git a/tests/test_school_moves.py b/tests/test_school_moves.py index 7b21a22dfd5..f6d4be9bb3a 100644 --- a/tests/test_school_moves.py +++ b/tests/test_school_moves.py @@ -63,7 +63,7 @@ def upload_class_list(): dashboard_page.click_children() children_search_page.search_for_a_child_name(str(children[0])) children_search_page.click_record_for_child(children[0]) - child_record_page.click_activity_log() + child_record_page.tabs.click_activity_log() child_activity_log_page.expect_activity_log_header( f"Added to the session at {schools[0]}" ) diff --git a/tests/test_sessions.py b/tests/test_sessions.py index f72b4027398..f1792bfdb2e 100644 --- a/tests/test_sessions.py +++ b/tests/test_sessions.py @@ -139,18 +139,18 @@ def test_attendance_filters_functionality( """ year_group = year_groups[Programme.HPV] - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() search_summary = sessions_register_page.page.get_by_text("Showing 1 to") expect(search_summary).not_to_have_text("Showing 1 to 1 of 1 children") - sessions_register_page.check_year_checkbox(year_group) - sessions_register_page.click_on_update_results() + sessions_register_page.search.check_year_checkbox(year_group) + sessions_register_page.search.click_on_update_results() expect(search_summary).to_contain_text("Showing 1 to") - sessions_register_page.uncheck_year_checkbox(year_group) - sessions_register_page.click_advanced_filters() - sessions_register_page.check_archived_records_checkbox() - sessions_register_page.click_on_update_results() + sessions_register_page.search.uncheck_year_checkbox(year_group) + sessions_register_page.search.click_advanced_filters() + sessions_register_page.search.check_archived_records_checkbox() + sessions_register_page.search.click_on_update_results() expect(search_summary).not_to_be_visible() @@ -167,8 +167,8 @@ def test_session_search_functionality( Verification: - Search returns expected results for the session. """ - sessions_overview_page.click_children_tab() - sessions_children_page.verify_search() + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.verify_search() @issue("MAV-1381") @@ -192,14 +192,14 @@ def test_consent_filters( """ child = children[Programme.HPV][0] sessions_overview_page.review_child_with_no_response() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[0]) nurse_consent_wizard_page.select_consent_method(ConsentMethod.PAPER) nurse_consent_wizard_page.record_parent_refuse_consent() - sessions_children_page.click_overview_tab() + sessions_children_page.tabs.click_overview_tab() sessions_overview_page.click_has_a_refusal() sessions_children_page.expect_has_a_refusal_to_be_selected() @@ -231,18 +231,18 @@ def test_session_activity_notes_order( note_1 = "Note 1" note_2 = "Note 2" - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_session_activity_and_notes() sessions_patient_session_activity_page.add_note(note_1) sessions_patient_session_activity_page.add_note(note_2) dashboard_page.click_mavis() dashboard_page.click_sessions() sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_children_tab() - sessions_children_page.search_for(str(child)) - sessions_children_page.check_note_appears_in_search(child, note_2) - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_for(str(child)) + sessions_children_page.search.check_note_appears_in_search(child, note_2) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_session_activity_and_notes() sessions_patient_session_activity_page.check_notes_appear_in_order([note_2, note_1]) @@ -271,8 +271,8 @@ def test_triage_consent_given_and_triage_outcome( child = children[Programme.HPV][0] school = schools[Programme.HPV][0] - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() @@ -287,8 +287,8 @@ def test_triage_consent_given_and_triage_outcome( sessions_search_page.click_session_for_programme_group(school, Programme.HPV) - sessions_overview_page.click_register_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_register_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_update_triage_outcome() sessions_patient_page.select_yes_safe_to_vaccinate() @@ -317,8 +317,8 @@ def test_consent_refused_and_activity_log( """ child = children[Programme.HPV][0] - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.HPV) sessions_patient_page.click_record_a_new_consent_response() @@ -328,7 +328,7 @@ def test_consent_refused_and_activity_log( expect_alert_text(nurse_consent_wizard_page.page, str(child)) sessions_children_page.select_has_a_refusal() - sessions_children_page.search_and_click_child(child) + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_session_activity_and_notes() sessions_patient_session_activity_page.check_session_activity_entry( f"Consent refused by {child.parents[0].name_and_relationship}", @@ -393,10 +393,10 @@ def test_verify_excel_export_and_clinic_invitation( nurse_consent_wizard_page.select_parent(child.parents[0]) nurse_consent_wizard_page.select_consent_method(ConsentMethod.IN_PERSON) nurse_consent_wizard_page.record_parent_positive_consent() - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord(child, Programme.HPV, batch_name) sessions_patient_page.set_up_vaccination(vaccination_record) sessions_vaccination_wizard_page.record_vaccination( @@ -464,8 +464,8 @@ def test_editing_session_programmes( expect_details(sessions_edit_page.page, "Programmes", "Flu HPV") sessions_edit_page.click_save_changes() sessions_edit_page.expect_session_to_have_programmes([Programme.FLU, Programme.HPV]) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.FLU) @@ -510,13 +510,13 @@ def test_accessibility( sessions_edit_page.click_back() sessions_edit_page.click_save_changes() - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() accessibility_helper.check_accessibility() - sessions_children_page.click_register_tab() + sessions_children_page.tabs.click_register_tab() accessibility_helper.check_accessibility() - sessions_register_page.search_and_click_child(child) + sessions_register_page.search.search_and_click_child(child) accessibility_helper.check_accessibility() sessions_patient_page.click_session_activity_and_notes() diff --git a/tests/test_tallying.py b/tests/test_tallying.py index 7cdf38748dd..7f28951f4c7 100644 --- a/tests/test_tallying.py +++ b/tests/test_tallying.py @@ -98,8 +98,8 @@ def test_tallying( # noqa: PLR0915 tally_totals = sessions_overview_page.get_all_totals(Programme.FLU) assert tally_totals[TallyCategory.NEEDS_CONSENT] > 0 - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.FLU) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[0]) @@ -112,8 +112,8 @@ def test_tallying( # noqa: PLR0915 tally_totals[TallyCategory.DUE_INJECTION] += 1 sessions_overview_page.check_all_totals(tally_totals) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_response_from_parent(child.parents[0]) sessions_patient_page.click_withdraw_consent() nurse_consent_wizard_page.click_consent_refusal_reason( @@ -128,8 +128,8 @@ def test_tallying( # noqa: PLR0915 tally_totals[TallyCategory.HAS_A_REFUSAL] += 1 sessions_overview_page.check_all_totals(tally_totals) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.invalidate_parent_refusal(child.parents[0]) sessions_patient_page.go_back_to_session_for_school(school) @@ -137,8 +137,8 @@ def test_tallying( # noqa: PLR0915 tally_totals[TallyCategory.NEEDS_CONSENT] += 1 sessions_overview_page.check_all_totals(tally_totals) - sessions_overview_page.click_children_tab() - sessions_children_page.search_and_click_child(child) + sessions_overview_page.tabs.click_children_tab() + sessions_children_page.search.search_and_click_child(child) sessions_patient_page.click_programme_tab(Programme.FLU) sessions_patient_page.click_record_a_new_consent_response() nurse_consent_wizard_page.select_parent(child.parents[1]) @@ -153,10 +153,10 @@ def test_tallying( # noqa: PLR0915 tally_totals[TallyCategory.DUE_NASAL_SPRAY] += 1 sessions_overview_page.check_all_totals(tally_totals) - sessions_overview_page.click_register_tab() + sessions_overview_page.tabs.click_register_tab() sessions_register_page.register_child_as_attending(str(child)) - sessions_register_page.click_record_vaccinations_tab() - sessions_record_vaccinations_page.search_and_click_child(child) + sessions_register_page.tabs.click_record_vaccinations_tab() + sessions_record_vaccinations_page.search.search_and_click_child(child) vaccination_record = VaccinationRecord( child, Programme.FLU, batch_name, ConsentOption.NASAL_SPRAY @@ -196,7 +196,7 @@ def test_tallying_totals_match_eligible_patients( sum_of_tally_totals = sum(tally_totals.values()) # Navigate to children tab to count eligible children - sessions_overview_page.click_children_tab() + sessions_overview_page.tabs.click_children_tab() # Count all children cards displayed (these are the eligible children) children_cards = sessions_children_page.page.locator( diff --git a/tests/test_vaccines.py b/tests/test_vaccines.py index 24dbe2cbc4c..52eb500e47b 100644 --- a/tests/test_vaccines.py +++ b/tests/test_vaccines.py @@ -35,12 +35,12 @@ def test_batch_add_change_archive( vaccines_page.click_add_batch(vaccine) add_batch_page.fill_name(batch_name) - add_batch_page.fill_expiry_date(get_offset_date(1)) + add_batch_page.date.fill_expiry_date(get_offset_date(1)) add_batch_page.confirm() expect(add_batch_page.success_alert).to_be_visible() vaccines_page.click_change_batch(vaccine, batch_name) - edit_batch_page.fill_expiry_date(get_offset_date(2)) + edit_batch_page.date.fill_expiry_date(get_offset_date(2)) edit_batch_page.confirm() expect(edit_batch_page.success_alert).to_be_visible() @@ -63,7 +63,7 @@ def test_batch_name_too_short(vaccine, add_batch_page, vaccines_page): """ vaccines_page.click_add_batch(vaccine) add_batch_page.fill_name("a") - add_batch_page.fill_expiry_date(get_offset_date(1)) + add_batch_page.date.fill_expiry_date(get_offset_date(1)) add_batch_page.confirm() expect( add_batch_page.error_listitem.filter( @@ -86,7 +86,7 @@ def test_batch_name_too_long(vaccine, add_batch_page, vaccines_page): """ vaccines_page.click_add_batch(vaccine) add_batch_page.fill_name("a" * 101) - add_batch_page.fill_expiry_date(get_offset_date(1)) + add_batch_page.date.fill_expiry_date(get_offset_date(1)) add_batch_page.confirm() expect( add_batch_page.error_listitem.filter( @@ -133,14 +133,14 @@ def test_accessibility( accessibility_helper.check_accessibility() add_batch_page.fill_name(batch_name) - add_batch_page.fill_expiry_date(get_offset_date(1)) + add_batch_page.date.fill_expiry_date(get_offset_date(1)) add_batch_page.confirm() accessibility_helper.check_accessibility() vaccines_page.click_change_batch(Vaccine.GARDASIL_9, batch_name) accessibility_helper.check_accessibility() - edit_batch_page.fill_expiry_date(get_offset_date(2)) + edit_batch_page.date.fill_expiry_date(get_offset_date(2)) edit_batch_page.confirm() vaccines_page.click_archive_batch(Vaccine.GARDASIL_9, batch_name)