rebase and fix test

Author: jf-x-dev

mavis/test/models.py

@@ -559,7 +559,7 @@ def get_onboarding_data_for_tests(
                 "medical_secretary",
                 "superuser",
                 "prescriber",
-                "medical_secretary",
+                "healthcare_assistant",
             )
         }
         clinics = [Clinic.generate()]

mavis/test/pages/sessions.py

@@ -510,6 +510,7 @@ def confirm_pre_screening_checks(
         for check in programme.pre_screening_checks(consent_option):
             locator = self.pre_screening_listitem.get_by_text(check)
             expect(locator).to_be_visible()
+        self.page.wait_for_load_state()
         self.pre_screening_checkbox.check()
 
     @step("Click on Yes")
@@ -858,8 +859,11 @@ def record_vaccination_for_child(
         notes: str = "",
         *,
         at_school: bool = True,
+        psd_option: bool = False,
     ) -> datetime:
-        self.click_record_vaccinations_tab()
+        # temporarily do not go to record vaccinations tab for psds
+        if not psd_option:
+            self.click_record_vaccinations_tab()
         self.search_child(vaccination_record.child)
         self.click_programme_tab(vaccination_record.programme)
 

tests/test_psd.py

@@ -1,7 +1,7 @@
 import pytest
 
 from mavis.test.data import ClassFileMapping
-from mavis.test.models import ConsentOption, Programme, Vaccine
+from mavis.test.models import ConsentOption, Programme, VaccinationRecord, Vaccine
 
 
 @pytest.fixture
@@ -94,10 +94,7 @@ def test_delivering_vaccination_after_psd(
     dashboard_page.click_sessions()
     sessions_page.click_session_for_programme_group(school, Programme.FLU)
     sessions_page.register_child_as_attending(str(child))
-    sessions_page.page.pause()
-    sessions_page.record_vaccs_for_child(
-        child,
-        Programme.FLU,
-        fluenz_batch_name,
-        ConsentOption.BOTH,
+    sessions_page.record_vaccination_for_child(
+        VaccinationRecord(child, Programme.FLU, fluenz_batch_name, ConsentOption.BOTH),
+        psd_option=True,
     )