update button text to match prototype

Author: MatMoore

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -24,7 +24,6 @@
 from manage_breast_screening.mammograms.presenters.symptom_presenter import (
     SymptomPresenter,
 )
-from manage_breast_screening.participants.models.symptom import SymptomType
 
 from .appointment_presenters import AppointmentPresenter
 
@@ -104,14 +103,7 @@ def medical_history_buttons(self):
     def add_lump_button(self):
         url = reverse("mammograms:add_symptom_lump", kwargs={"pk": self.appointment.pk})
 
-        return {
-            "href": url,
-            "text": (
-                "Add another lump"
-                if SymptomType.LUMP in self.existing_symptom_type_ids
-                else "Add a lump"
-            ),
-        }
+        return {"href": url, "text": "Lump"}
 
     @property
     def add_swelling_or_shape_change_button(self):
@@ -120,15 +112,7 @@ def add_swelling_or_shape_change_button(self):
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another swelling or shape change"
-                if SymptomType.SWELLING_OR_SHAPE_CHANGE
-                in self.existing_symptom_type_ids
-                else "Add a swelling or shape change"
-            ),
-        }
+        return {"href": url, "text": "Swelling or shape change"}
 
     @property
     def add_skin_change_button(self):
@@ -137,14 +121,7 @@ def add_skin_change_button(self):
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another skin change"
-                if SymptomType.SKIN_CHANGE in self.existing_symptom_type_ids
-                else "Add a skin change"
-            ),
-        }
+        return {"href": url, "text": "Skin change"}
 
     @property
     def add_nipple_change_button(self):
@@ -153,14 +130,7 @@ def add_nipple_change_button(self):
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another nipple change"
-                if SymptomType.NIPPLE_CHANGE in self.existing_symptom_type_ids
-                else "Add a nipple change"
-            ),
-        }
+        return {"href": url, "text": "Nipple change"}
 
     @property
     def add_other_symptom_button(self):
@@ -169,14 +139,7 @@ def add_other_symptom_button(self):
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another symptom (other symptom)"
-                if SymptomType.NIPPLE_CHANGE in self.existing_symptom_type_ids
-                else "Add a symptom (other symptom)"
-            ),
-        }
+        return {"href": url, "text": "Other"}
 
     @property
     def add_breast_cancer_history_button(self):
@@ -187,7 +150,7 @@ def add_breast_cancer_history_button(self):
 
         return {
             "href": url,
-            "text": ("Add breast cancer history"),
+            "text": "Breast cancer",
         }
 
     @property
@@ -199,7 +162,7 @@ def add_implanted_medical_device_history_button(self):
 
         return {
             "href": url,
-            "text": ("Add implanted medical device history"),
+            "text": "Implanted medical device",
         }
 
     @property
@@ -211,7 +174,7 @@ def add_cyst_history_button(self):
 
         return {
             "href": url,
-            "text": ("Add cyst history"),
+            "text": ("Cysts"),
         }
 
     @property
@@ -223,7 +186,7 @@ def add_breast_augmentation_history_button(self):
 
         return {
             "href": url,
-            "text": ("Add breast augmentation history"),
+            "text": "Breast implants or augmentation",
         }
 
     @property
@@ -235,7 +198,7 @@ def add_benign_lump_history_button(self):
 
         return {
             "href": url,
-            "text": "Add benign lump history",
+            "text": "Benign lumps",
         }
 
     @property
@@ -247,7 +210,7 @@ def add_mastectomy_or_lumpectomy_history_button(self):
 
         return {
             "href": url,
-            "text": "Add mastectomy or lumpectomy history",
+            "text": "Mastectomy or lumpectomy",
         }
 
     @property
@@ -259,7 +222,7 @@ def add_other_procedure_history_button(self):
 
         return {
             "href": url,
-            "text": "Add other procedure history",
+            "text": "Other procedures",
         }
 
     def _present_items(self, items, presenter_class):

manage_breast_screening/mammograms/tests/presenters/test_medical_information_presenter.py

@@ -83,39 +83,15 @@ def test_add_lump_button(self):
 
         assert MedicalInformationPresenter(appointment).add_lump_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/lump/",
-            "text": "Add a lump",
-        }
-
-        SymptomFactory.create(
-            appointment=appointment,
-            lump=True,
-            when_started=RelativeDateChoices.LESS_THAN_THREE_MONTHS,
-            area=SymptomAreas.BOTH_BREASTS,
-        )
-
-        assert MedicalInformationPresenter(appointment).add_lump_button == {
-            "href": f"/mammograms/{appointment.pk}/record-medical-information/lump/",
-            "text": "Add another lump",
+            "text": "Lump",
         }
 
     def test_add_nipple_change_button(self):
         appointment = AppointmentFactory()
 
         assert MedicalInformationPresenter(appointment).add_nipple_change_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/nipple-change/",
-            "text": "Add a nipple change",
-        }
-
-        SymptomFactory.create(
-            appointment=appointment,
-            inversion=True,
-            when_started=RelativeDateChoices.LESS_THAN_THREE_MONTHS,
-            area=SymptomAreas.BOTH_BREASTS,
-        )
-
-        assert MedicalInformationPresenter(appointment).add_nipple_change_button == {
-            "href": f"/mammograms/{appointment.pk}/record-medical-information/nipple-change/",
-            "text": "Add another nipple change",
+            "text": "Nipple change",
         }
 
     def test_add_breast_cancer_history_button(self):
@@ -125,7 +101,7 @@ def test_add_breast_cancer_history_button(self):
             appointment
         ).add_breast_cancer_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/breast-cancer-history/",
-            "text": "Add breast cancer history",
+            "text": "Breast cancer",
         }
 
     def test_implanted_medical_device_history_button(self):
@@ -135,7 +111,7 @@ def test_implanted_medical_device_history_button(self):
             appointment
         ).add_implanted_medical_device_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/implanted-medical-device-history/",
-            "text": "Add implanted medical device history",
+            "text": "Implanted medical device",
         }
 
     def test_implanted_medical_device_history_items_have_a_counter(self):
@@ -193,7 +169,7 @@ def test_cyst_history_button(self):
 
         assert MedicalInformationPresenter(appointment).add_cyst_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/cyst-history/",
-            "text": "Add cyst history",
+            "text": "Cysts",
         }
 
     def test_breast_augmentation_history_button(self):
@@ -203,7 +179,7 @@ def test_breast_augmentation_history_button(self):
             appointment
         ).add_breast_augmentation_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/breast-augmentation-history/",
-            "text": "Add breast augmentation history",
+            "text": "Breast implants or augmentation",
         }
 
     def test_add_benign_lump_history_button(self):
@@ -213,7 +189,7 @@ def test_add_benign_lump_history_button(self):
             appointment
         ).add_benign_lump_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/benign-lump-history/",
-            "text": "Add benign lump history",
+            "text": "Benign lumps",
         }
 
     def test_mastectomy_or_lumpectomy_history_button(self):
@@ -223,7 +199,7 @@ def test_mastectomy_or_lumpectomy_history_button(self):
             appointment
         ).add_mastectomy_or_lumpectomy_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/mastectomy-or-lumpectomy-history/",
-            "text": "Add mastectomy or lumpectomy history",
+            "text": "Mastectomy or lumpectomy",
         }
 
     def test_mastectomy_or_lumpectomy_history_items_have_a_counter(self):
@@ -261,7 +237,7 @@ def test_other_procedure_history_button(self):
             appointment
         ).add_other_procedure_history_button == {
             "href": f"/mammograms/{appointment.pk}/record-medical-information/other-procedure-history/",
-            "text": "Add other procedure history",
+            "text": "Other procedures",
         }
 
     def test_other_procedure_history_items_have_a_counter(self):

manage_breast_screening/tests/system/clinical/test_benign_lump_history.py

@@ -19,7 +19,7 @@ def test_adding_a_benign_lump_history_item(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_benign_lump_history()
+        self.when_i_click_on_benign_lumps()
         self.then_i_see_the_add_benign_lump_history_form()
         self.when_i_try_to_save_without_entering_benign_lump_details()
         self.then_i_see_validation_errors_for_missing_benign_lump_details()
@@ -54,7 +54,7 @@ def test_accessibility(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_benign_lump_history()
+        self.when_i_click_on_benign_lumps()
         self.then_the_accessibility_baseline_is_met()
 
     def and_there_is_an_appointment(self):
@@ -74,8 +74,8 @@ def and_i_am_on_the_record_medical_information_page(self):
             )
         )
 
-    def when_i_click_on_add_benign_lump_history(self):
-        self.page.get_by_text("Add benign lump history", exact=True).click()
+    def when_i_click_on_benign_lumps(self):
+        self.page.get_by_role("button").filter(has_text="Benign lumps").click()
 
     def then_i_see_the_add_benign_lump_history_form(self):
         expect(self.page.get_by_text("Add details of benign lumps")).to_be_visible()

manage_breast_screening/tests/system/clinical/test_breast_augmentation_history.py

@@ -15,7 +15,7 @@ def test_adding_breast_augmentation(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_breast_augmentation()
+        self.when_i_click_on_breast_implants_or_augmentation()
         self.then_i_see_the_add_breast_augmentation_form()
 
         self.when_i_click_save_without_entering_details()
@@ -42,7 +42,7 @@ def test_accessibility(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_breast_augmentation()
+        self.when_i_click_on_breast_implants_or_augmentation()
         self.then_the_accessibility_baseline_is_met()
 
     def and_there_is_an_appointment(self):
@@ -62,8 +62,10 @@ def and_i_am_on_the_record_medical_information_page(self):
             )
         )
 
-    def when_i_click_on_add_breast_augmentation(self):
-        self.page.get_by_text("Add breast augmentation history").click()
+    def when_i_click_on_breast_implants_or_augmentation(self):
+        self.page.get_by_role("button").filter(
+            has_text="Breast implants or augmentation"
+        ).click()
 
     def then_i_see_the_add_breast_augmentation_form(self):
         expect(

manage_breast_screening/tests/system/clinical/test_breast_cancer_history.py

@@ -15,7 +15,7 @@ def test_adding_and_editing_breast_cancer_history(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_breast_cancer_history()
+        self.when_i_click_on_breast_cancer()
         self.then_i_see_the_add_breast_cancer_history_form()
 
         self.when_i_select_right_breast()
@@ -50,14 +50,14 @@ def test_accessibility(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_breast_cancer_history()
+        self.when_i_click_on_breast_cancer()
         self.then_the_accessibility_baseline_is_met()
 
     def test_validation_errors(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_breast_cancer_history()
+        self.when_i_click_on_breast_cancer()
         self.and_i_click_save()
         self.then_i_am_prompted_to_fill_in_required_fields()
 
@@ -78,8 +78,8 @@ def and_i_am_on_the_record_medical_information_page(self):
             )
         )
 
-    def when_i_click_on_add_breast_cancer_history(self):
-        self.page.get_by_text("Add breast cancer history").click()
+    def when_i_click_on_breast_cancer(self):
+        self.page.get_by_role("button").filter(has_text="Breast cancer").click()
 
     def then_i_see_the_add_breast_cancer_history_form(self):
         expect(self.page.get_by_text("Add details of breast cancer")).to_be_visible()
@@ -215,4 +215,3 @@ def and_the_history_item_is_gone(self):
         row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
         expect(row).not_to_contain_text("Cancer location")
         expect(row.get_by_text("Change")).not_to_be_attached()
-        expect(row.get_by_text("Add breast cancer history")).to_be_attached()

manage_breast_screening/tests/system/clinical/test_cyst_history.py

@@ -15,7 +15,7 @@ def test_adding_and_changing_cyst(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_cyst()
+        self.when_i_click_on_cysts()
         self.then_i_see_the_add_cyst_form()
 
         self.when_i_select_no_treatment()
@@ -36,7 +36,7 @@ def test_accessibility(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
         self.and_i_am_on_the_record_medical_information_page()
-        self.when_i_click_on_add_cyst()
+        self.when_i_click_on_cysts()
         self.then_the_accessibility_baseline_is_met()
 
     def and_there_is_an_appointment(self):
@@ -56,8 +56,8 @@ def and_i_am_on_the_record_medical_information_page(self):
             )
         )
 
-    def when_i_click_on_add_cyst(self):
-        self.page.get_by_text("Add cyst history").click()
+    def when_i_click_on_cysts(self):
+        self.page.get_by_role("button").filter(has_text="Cysts").click()
 
     def then_i_see_the_add_cyst_form(self):
         expect(self.page.get_by_text("Add details of cysts")).to_be_visible()