Merge pull request #795 from NHSDigital/rename-online-consent-page

Rename online consent page

Author: jf-x-dev

mavis/test/__init__.py

@@ -41,7 +41,7 @@
     nurse,
     nurse_consent_wizard_page,
     onboarding,
-    online_consent_page,
+    online_consent_wizard_page,
     organisation,
     prescriber,
     programme_children_page,
@@ -127,7 +127,7 @@
     "nurse",
     "nurse_consent_wizard_page",
     "onboarding",
-    "online_consent_page",
+    "online_consent_wizard_page",
     "organisation",
     "prescriber",
     "programme_children_page",

mavis/test/fixtures/__init__.py

@@ -55,7 +55,7 @@
     log_out_page,
     match_consent_response_page,
     nurse_consent_wizard_page,
-    online_consent_page,
+    online_consent_wizard_page,
     programme_children_page,
     programme_overview_page,
     programme_sessions_page,
@@ -132,7 +132,7 @@
     "nurse",
     "nurse_consent_wizard_page",
     "onboarding",
-    "online_consent_page",
+    "online_consent_wizard_page",
     "organisation",
     "prescriber",
     "programme_children_page",

mavis/test/fixtures/pages.py

@@ -25,7 +25,7 @@
     LogOutPage,
     MatchConsentResponsePage,
     NurseConsentWizardPage,
-    OnlineConsentPage,
+    OnlineConsentWizardPage,
     ProgrammeChildrenPage,
     ProgrammeOverviewPage,
     ProgrammeSessionsPage,
@@ -158,8 +158,8 @@ def match_consent_response_page(page: Page) -> MatchConsentResponsePage:
 
 
 @pytest.fixture
-def online_consent_page(page: Page) -> OnlineConsentPage:
-    return OnlineConsentPage(page)
+def online_consent_wizard_page(page: Page) -> OnlineConsentWizardPage:
+    return OnlineConsentWizardPage(page)
 
 
 @pytest.fixture

mavis/test/pages/__init__.py

@@ -18,7 +18,7 @@
 from .import_records import ImportRecordsWizardPage, ImportsPage
 from .log_in import LogInPage, LogOutPage
 from .nurse_consent import GillickCompetencePage, NurseConsentWizardPage
-from .online_consent import OnlineConsentPage
+from .online_consent import OnlineConsentWizardPage
 from .programmes import (
     ProgrammeChildrenPage,
     ProgrammeOverviewPage,
@@ -68,7 +68,7 @@
     "LogOutPage",
     "MatchConsentResponsePage",
     "NurseConsentWizardPage",
-    "OnlineConsentPage",
+    "OnlineConsentWizardPage",
     "ProgrammeChildrenPage",
     "ProgrammeOverviewPage",
     "ProgrammeSessionsPage",

mavis/test/pages/online_consent.py

@@ -13,7 +13,7 @@
 )
 
 
-class OnlineConsentPage:
+class OnlineConsentWizardPage:
     def __init__(self, page: Page) -> None:
         self.page = page
 

tests/test_consent_responses.py

@@ -24,7 +24,7 @@ def online_consent_url(schedule_session_and_get_consent_url, schools):
 def give_online_consent(
     page,
     start_page,
-    online_consent_page,
+    online_consent_wizard_page,
     online_consent_url,
     children,
     schools,
@@ -34,18 +34,18 @@ def give_online_consent(
 
     page.goto(online_consent_url)
     start_page.start()
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_hpv_vaccination()
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(4, yes_to_health_questions=False)
-    online_consent_page.click_confirm()
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_hpv_vaccination()
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(4, yes_to_health_questions=False)
+    online_consent_wizard_page.click_confirm()
 
 
 @pytest.fixture
 def give_online_consent_pds_child(
     page,
     start_page,
-    online_consent_page,
+    online_consent_wizard_page,
     online_consent_url,
     pds_child,
     schools,
@@ -55,11 +55,11 @@ def give_online_consent_pds_child(
 
     page.goto(online_consent_url)
     start_page.start()
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_hpv_vaccination()
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(4, yes_to_health_questions=False)
-    online_consent_page.click_confirm()
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_hpv_vaccination()
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(4, yes_to_health_questions=False)
+    online_consent_wizard_page.click_confirm()
 
 
 @pytest.fixture

tests/test_e2e_doubles.py

@@ -22,7 +22,7 @@ def setup_session_for_doubles(setup_session_and_batches_with_fixed_child):
 def test_recording_doubles_vaccination_e2e(
     doubles_consent_url,
     setup_session_for_doubles,
-    online_consent_page,
+    online_consent_wizard_page,
     sessions_search_page,
     sessions_overview_page,
     sessions_register_page,
@@ -57,26 +57,26 @@ def test_recording_doubles_vaccination_e2e(
     revaxis_batch_name = setup_session_for_doubles[Vaccine.REVAXIS]
 
     number_of_health_questions = (
-        online_consent_page.get_number_of_health_questions_for_programmes(
+        online_consent_wizard_page.get_number_of_health_questions_for_programmes(
             [Programme.MENACWY, Programme.TD_IPV],
         )
     )
 
-    online_consent_page.go_to_url(doubles_consent_url)
+    online_consent_wizard_page.go_to_url(doubles_consent_url)
     start_page.start()
 
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_doubles_vaccinations(
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_doubles_vaccinations(
         Programme.MENACWY,
         Programme.TD_IPV,
     )
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(
         number_of_health_questions,
         yes_to_health_questions=False,
     )
-    online_consent_page.click_confirm()
-    online_consent_page.check_final_consent_message(
+    online_consent_wizard_page.click_confirm()
+    online_consent_wizard_page.check_final_consent_message(
         child,
         programmes=[Programme.MENACWY, Programme.TD_IPV],
         yes_to_health_questions=False,

tests/test_e2e_flu.py

@@ -31,7 +31,7 @@ def setup_session_for_flu(setup_session_and_batches_with_fixed_child):
 def test_recording_flu_vaccination_e2e(
     flu_consent_url,
     setup_session_for_flu,
-    online_consent_page,
+    online_consent_wizard_page,
     sessions_search_page,
     sessions_overview_page,
     sessions_register_page,
@@ -74,18 +74,20 @@ def test_recording_flu_vaccination_e2e(
         else batch_names[Vaccine.FLUENZ]
     )
 
-    online_consent_page.go_to_url(flu_consent_url)
+    online_consent_wizard_page.go_to_url(flu_consent_url)
     start_page.start()
 
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_flu_vaccination(consent_option=consent_option)
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(
-        online_consent_page.get_number_of_health_questions_for_flu(consent_option),
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_flu_vaccination(consent_option=consent_option)
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(
+        online_consent_wizard_page.get_number_of_health_questions_for_flu(
+            consent_option
+        ),
         yes_to_health_questions=False,
     )
-    online_consent_page.click_confirm()
-    online_consent_page.check_final_consent_message(
+    online_consent_wizard_page.click_confirm()
+    online_consent_wizard_page.check_final_consent_message(
         child,
         programmes=[Programme.FLU],
         yes_to_health_questions=False,

tests/test_e2e_hpv.py

@@ -20,7 +20,7 @@ def setup_session_for_hpv(setup_session_and_batches_with_fixed_child):
 def test_recording_hpv_vaccination_e2e(
     hpv_consent_url,
     setup_session_for_hpv,
-    online_consent_page,
+    online_consent_wizard_page,
     sessions_search_page,
     sessions_overview_page,
     sessions_register_page,
@@ -53,18 +53,18 @@ def test_recording_hpv_vaccination_e2e(
     gardasil_9_batch_name = setup_session_for_hpv[Vaccine.GARDASIL_9]
     number_of_health_questions = len(Programme.health_questions(Programme.HPV))
 
-    online_consent_page.go_to_url(hpv_consent_url)
+    online_consent_wizard_page.go_to_url(hpv_consent_url)
     start_page.start()
 
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_hpv_vaccination()
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_hpv_vaccination()
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(
         number_of_health_questions,
         yes_to_health_questions=False,
     )
-    online_consent_page.click_confirm()
-    online_consent_page.check_final_consent_message(
+    online_consent_wizard_page.click_confirm()
+    online_consent_wizard_page.check_final_consent_message(
         child,
         programmes=[Programme.HPV],
         yes_to_health_questions=False,

tests/test_e2e_mmr.py

@@ -21,7 +21,7 @@ def setup_session_for_mmr(setup_session_and_batches_with_fixed_child):
 def test_recording_mmr_vaccination_e2e_with_triage(
     url_with_mmr_session_scheduled,
     setup_session_for_mmr,
-    online_consent_page,
+    online_consent_wizard_page,
     sessions_search_page,
     sessions_overview_page,
     sessions_register_page,
@@ -57,18 +57,18 @@ def test_recording_mmr_vaccination_e2e_with_triage(
         Programme.health_questions(Programme.MMR, ConsentOption.MMR_EITHER)
     )
 
-    online_consent_page.go_to_url(url_with_mmr_session_scheduled)
+    online_consent_wizard_page.go_to_url(url_with_mmr_session_scheduled)
     start_page.start()
 
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_mmr_vaccination(ConsentOption.MMR_EITHER)
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_mmr_vaccination(ConsentOption.MMR_EITHER)
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(
         number_of_health_questions,
         yes_to_health_questions=True,
     )
-    online_consent_page.click_confirm()
-    online_consent_page.check_final_consent_message(
+    online_consent_wizard_page.click_confirm()
+    online_consent_wizard_page.check_final_consent_message(
         child,
         programmes=[Programme.MMR],
         yes_to_health_questions=True,
@@ -106,7 +106,7 @@ def test_recording_mmr_vaccination_e2e_with_triage(
 def test_verify_child_cannot_be_vaccinated_twice_for_mmr_on_same_day(
     url_with_mmr_session_scheduled,
     setup_session_for_mmr,
-    online_consent_page,
+    online_consent_wizard_page,
     sessions_search_page,
     sessions_overview_page,
     sessions_register_page,
@@ -143,18 +143,20 @@ def test_verify_child_cannot_be_vaccinated_twice_for_mmr_on_same_day(
         Programme.health_questions(Programme.MMR, ConsentOption.MMR_WITHOUT_GELATINE)
     )
 
-    online_consent_page.go_to_url(url_with_mmr_session_scheduled)
+    online_consent_wizard_page.go_to_url(url_with_mmr_session_scheduled)
     start_page.start()
 
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_mmr_vaccination(ConsentOption.MMR_WITHOUT_GELATINE)
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_mmr_vaccination(
+        ConsentOption.MMR_WITHOUT_GELATINE
+    )
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(
         number_of_health_questions,
         yes_to_health_questions=False,
     )
-    online_consent_page.click_confirm()
-    online_consent_page.check_final_consent_message(
+    online_consent_wizard_page.click_confirm()
+    online_consent_wizard_page.check_final_consent_message(
         child,
         programmes=[Programme.MMR],
         yes_to_health_questions=False,
@@ -190,7 +192,7 @@ def test_verify_child_cannot_be_vaccinated_twice_for_mmr_on_same_day(
 def test_recording_mmr_vaccination_e2e_with_imported_dose_one(
     url_with_mmr_session_scheduled,
     setup_session_for_mmr,
-    online_consent_page,
+    online_consent_wizard_page,
     sessions_search_page,
     sessions_overview_page,
     sessions_register_page,
@@ -234,18 +236,18 @@ def test_recording_mmr_vaccination_e2e_with_imported_dose_one(
     log_in_page.log_out()
 
     # Proceed with consent and vaccination process
-    online_consent_page.go_to_url(url_with_mmr_session_scheduled)
+    online_consent_wizard_page.go_to_url(url_with_mmr_session_scheduled)
     start_page.start()
 
-    online_consent_page.fill_details(child, child.parents[0], schools)
-    online_consent_page.agree_to_mmr_vaccination(ConsentOption.MMR_EITHER)
-    online_consent_page.fill_address_details(*child.address)
-    online_consent_page.answer_health_questions(
+    online_consent_wizard_page.fill_details(child, child.parents[0], schools)
+    online_consent_wizard_page.agree_to_mmr_vaccination(ConsentOption.MMR_EITHER)
+    online_consent_wizard_page.fill_address_details(*child.address)
+    online_consent_wizard_page.answer_health_questions(
         number_of_health_questions,
         yes_to_health_questions=True,
     )
-    online_consent_page.click_confirm()
-    online_consent_page.check_final_consent_message(
+    online_consent_wizard_page.click_confirm()
+    online_consent_wizard_page.check_final_consent_message(
         child,
         programmes=[Programme.MMR],
         yes_to_health_questions=True,