Merge pull request #844 from NHSDigital/add-batch-page-init

Make some tests more reliable

Author: jf-x-dev

mavis/test/fixtures/helpers.py

@@ -63,6 +63,7 @@ def wrapper(school: School, *programmes: Programme):
 
         LogInPage(page).navigate()
         LogInPage(page).log_in_and_choose_team_if_necessary(nurse, team)
+
         schedule_school_session_if_needed(
             page, school, list(programmes), [year_group], date_offset=7
         )

mavis/test/pages/sessions/sessions_patient_page.py

@@ -218,8 +218,12 @@ def confirm_pre_screening_checks(
             locator = self.pre_screening_listitem.get_by_text(check)
             expect(locator).to_be_visible()
         self.page.wait_for_load_state()
+        expect(self.pre_screening_checkbox).to_be_editable()
         self.pre_screening_checkbox.check()
 
+        self.page.wait_for_load_state()
+        expect(self.pre_screening_checkbox).to_be_checked()
+
     def expect_conflicting_consent_text(self) -> None:
         expect(
             self.page.get_by_text(

mavis/test/pages/sessions/sessions_vaccination_wizard_page.py

@@ -10,6 +10,7 @@
 from mavis.test.utils import (
     expect_alert_text,
     expect_details,
+    reload_until_element_is_visible,
 )
 
 
@@ -47,7 +48,13 @@ def expect_consent_refused_text(self, parent: Parent) -> None:
 
     @step("Choose batch {1}")
     def choose_batch(self, batch_name: str) -> None:
-        self.page.get_by_role("radio", name=batch_name).check()
+        batch_radio = self.page.get_by_role("radio", name=batch_name)
+
+        reload_until_element_is_visible(
+            self.page,
+            batch_radio,
+        )
+        batch_radio.check()
         self.click_continue_button()
 
     def record_vaccination(

mavis/test/pages/vaccines/batch_expiry_date.py

@@ -7,6 +7,7 @@
 
 class BatchExpiryDate:
     def __init__(self, page: Page) -> None:
+        self.page = page
         self.expiry_day_textbox = page.get_by_role("textbox", name="Day")
         self.expiry_month_textbox = page.get_by_role("textbox", name="Month")
         self.expiry_year_textbox = page.get_by_role("textbox", name="Year")

tests/test_tallying.py

@@ -30,13 +30,8 @@
 
 
 @pytest.fixture
-def setup_tests(log_in_as_nurse, page):
-    DashboardPage(page).click_sessions()
-
-
-@pytest.fixture
-def setup_session_with_file_upload(
-    setup_tests,
+def setup_flu_vaccination(
+    log_in_as_nurse,
     add_vaccine_batch,
     schools,
     page,
@@ -47,6 +42,7 @@ def setup_session_with_file_upload(
     year_group = year_groups[Programme.FLU]
 
     def _setup(class_list_file):
+        DashboardPage(page).click_sessions()
         batch_names = {
             vaccine: add_vaccine_batch(vaccine)
             for vaccine in [Vaccine.SEQUIRUS, Vaccine.FLUENZ]
@@ -65,8 +61,8 @@ def _setup(class_list_file):
 
 
 @pytest.fixture
-def setup_fixed_child(setup_session_with_file_upload):
-    yield from setup_session_with_file_upload(ClassFileMapping.FIXED_CHILD)
+def setup_fixed_child(setup_flu_vaccination):
+    yield from setup_flu_vaccination(ClassFileMapping.FIXED_CHILD)
 
 
 @issue("MAV-1669")
@@ -170,9 +166,12 @@ def test_tallying(  # noqa: PLR0915
     "programme", list(Programme), ids=lambda p: f"Programme: {p.value}"
 )
 def test_tallying_totals_match_eligible_patients(
-    setup_fixed_child,
+    log_in_as_nurse,
     page,
     programme,
+    year_groups,
+    schools,
+    file_generator,
 ):
     """
     Test: Verify that tallying totals match the number of eligible patients.
@@ -183,6 +182,17 @@ def test_tallying_totals_match_eligible_patients(
     - Sum of tally totals should equal the number of eligible children shown
       on the children tab.
     """
+    school = schools[programme.group][0]
+    year_group = year_groups[programme.group]
+
+    DashboardPage(page).click_schools()
+    SchoolsSearchPage(page).click_school(school)
+    SchoolsChildrenPage(page).click_import_class_lists()
+    ImportRecordsWizardPage(page, file_generator).import_class_list(
+        ClassFileMapping.FIXED_CHILD, year_group, programme.group
+    )
+    schedule_school_session_if_needed(page, school, [programme], [year_group])
+
     # Get tally totals for the programme
     tally_totals = SessionsOverviewPage(page).get_all_totals(programme)
     sum_of_tally_totals = sum(tally_totals.values())