Fix broken tests that needed current smoker

jamiefalcus · jamiefalcus · commit 962cc575477d · 2026-04-10T11:07:38.000Z
diff --git a/lung_cancer_screening/questions/forms/when_you_quit_smoking_form.py b/lung_cancer_screening/questions/forms/when_you_quit_smoking_form.py
@@ -25,6 +25,6 @@ def __init__(self, *args, **kwargs):
                 "min_value":"The age you quit smoking must be between 1 and your current age",
                 "age_when_quit_smoking_greater_than_age_started":"The age you quit smoking cannot be lower than the age you started smoking",
                 "age_when_quit_smoking_greater_than_current_age" : "The age you quit smoking must be the same as, or less than, your current age",
-                "no_date_of_birth" : format_html("<a href=\"{}\">Provide your date of birth</a> before answering this question", reverse_lazy("questions:date_of_birth"))
+                "no_date_of_birth" : format_html("<a href=\"{}\">Provide your date of birth</a> before answering when you quit smoking", reverse_lazy("questions:date_of_birth"))
             }
         )
diff --git a/lung_cancer_screening/questions/models/when_you_quit_smoking_response.py b/lung_cancer_screening/questions/models/when_you_quit_smoking_response.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.core.validators import MinValueValidator, MaxValueValidator
+from django.core.validators import MinValueValidator
 from django.core.exceptions import ValidationError
 
 from .base import BaseModel
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_age_when_started_smoking_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_age_when_started_smoking_form.py
@@ -3,6 +3,8 @@
 from django.utils import timezone
 from dateutil.relativedelta import relativedelta
 
+from lung_cancer_screening.questions.tests.factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
+
 from ....models.age_when_started_smoking_response import AgeWhenStartedSmokingResponse
 
 from ...factories.response_set_factory import ResponseSetFactory
@@ -20,6 +22,9 @@ def setUp(self):
             response_set=self.response_set,
             value=timezone.now() - relativedelta(years=int(60))
         )
+
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
+
         self.response = AgeWhenStartedSmokingResponse(
             response_set=self.response_set
         )
@@ -91,7 +96,7 @@ def test_is_invalid_if_no_date_of_birth(self):
         self.assertFalse(form.is_valid())
         self.assertEqual(
             form.errors["value"],
-            ["<a href=\"/date-of-birth\">Provide your date of birth</a> before answering this question"]
+            ["<a href=\"/date-of-birth\">Provide your date of birth</a> before answering age when you started smoking"]
         )
 
     def test_is_invalid_when_age_entered_greater_than_current_age(self):
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_periods_when_you_stopped_smoking_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_periods_when_you_stopped_smoking_form.py
@@ -15,6 +15,7 @@ def setUp(self):
         self.age_when_started_smoking_response = AgeWhenStartedSmokingResponseFactory.create(
             response_set=self.response_set
         )
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
         self.response = PeriodsWhenYouStoppedSmokingResponseFactory.create(
             response_set=self.response_set,
             value=True,
@@ -43,11 +44,6 @@ def test_clears_the_duration_years_if_value_is_no(self):
 
 
     def test_has_a_label_for_current_smoker(self):
-        HaveYouEverSmokedResponseFactory.create(
-            response_set=self.response_set,
-            current_smoker=True,
-        )
-
         form = PeriodsWhenYouStoppedSmokingForm(
             instance=self.response,
             data=self.valid_params
@@ -60,6 +56,7 @@ def test_has_a_label_for_current_smoker(self):
 
 
     def test_has_a_label_for_former_smoker(self):
+        self.response_set.have_you_ever_smoked_response.delete()
         HaveYouEverSmokedResponseFactory.create(
             response_set=self.response_set,
             former_smoker=True,
@@ -77,11 +74,6 @@ def test_has_a_label_for_former_smoker(self):
 
 
     def test_has_a_duration_years_label_for_current_smoker(self):
-        HaveYouEverSmokedResponseFactory.create(
-            response_set=self.response_set,
-            current_smoker=True,
-        )
-
         form = PeriodsWhenYouStoppedSmokingForm(
             instance=self.response,
             data=self.valid_params,
@@ -94,11 +86,6 @@ def test_has_a_duration_years_label_for_current_smoker(self):
 
 
     def test_has_a_duration_years_label_for_former_smoker(self):
-        HaveYouEverSmokedResponseFactory.create(
-            response_set=self.response_set,
-            former_smoker=True,
-        )
-
         form = PeriodsWhenYouStoppedSmokingForm(
             instance=self.response,
             data=self.valid_params,
@@ -111,11 +98,6 @@ def test_has_a_duration_years_label_for_former_smoker(self):
 
 
     def test_has_a_required_error_for_current_smoker(self):
-        HaveYouEverSmokedResponseFactory.create(
-            response_set=self.response_set,
-            current_smoker=True,
-        )
-
         form = PeriodsWhenYouStoppedSmokingForm(
             instance=self.response,
             data={
@@ -130,6 +112,7 @@ def test_has_a_required_error_for_current_smoker(self):
 
 
     def test_has_a_required_error_for_former_smoker(self):
+        self.response_set.have_you_ever_smoked_response.delete()
         HaveYouEverSmokedResponseFactory.create(
             response_set=self.response_set,
             former_smoker=True,
@@ -148,11 +131,6 @@ def test_has_a_required_error_for_former_smoker(self):
 
 
     def test_has_a_duration_years_required_error_for_current_smoker(self):
-        HaveYouEverSmokedResponseFactory.create(
-            response_set=self.response_set,
-            current_smoker=True,
-        )
-
         form = PeriodsWhenYouStoppedSmokingForm(
             instance=self.response,
             data={
@@ -168,6 +146,7 @@ def test_has_a_duration_years_required_error_for_current_smoker(self):
 
 
     def test_has_a_duration_years_required_error_for_former_smoker(self):
+        self.response_set.have_you_ever_smoked_response.delete()
         HaveYouEverSmokedResponseFactory.create(
             response_set=self.response_set,
             former_smoker=True,
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_when_you_quit_smoking_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_when_you_quit_smoking_form.py
@@ -1,19 +1,27 @@
 from django.test import TestCase, tag
 
-
+from lung_cancer_screening.questions.tests.factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.date_of_birth_response_factory import DateOfBirthResponseFactory
 from ...factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
 from ...factories.when_you_quit_smoking_response_factory import WhenYouQuitSmokingResponseFactory
+from ...factories.periods_when_you_stopped_smoking_response_factory import PeriodsWhenYouStoppedSmokingResponseFactory
 
 from ....forms.when_you_quit_smoking_form import WhenYouQuitSmokingForm
+from ....forms.age_when_started_smoking_form import AgeWhenStartedSmokingForm
+
+from ....models.periods_when_you_stopped_smoking_response import PeriodsWhenYouStoppedSmokingResponse
+from ....models.when_you_quit_smoking_response import WhenYouQuitSmokingResponse
 
 
 @tag("WhenYouQuitSmoking")
 class TestWhenYouQuitSmokingForm(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()
+
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
+
         self.date_of_birth_response = DateOfBirthResponseFactory(
             response_set=self.response_set,
             eligible=True,
@@ -24,7 +32,7 @@ def setUp(self):
         )
         self.response = WhenYouQuitSmokingResponseFactory(
             response_set=self.response_set,
-            value=self.age_when_started_smoking_response.value + 1
+            value=self.age_when_started_smoking_response.value + 2
         )
 
     def test_is_valid_with_valid_input(self):
@@ -61,67 +69,69 @@ def test_is_invalid_when_zero_is_entered(self):
             ["The age you quit smoking must be between 1 and your current age"],
         )
 
-    # def test_is_invalid_if_no_date_of_birth(self):
-    #     response_set = ResponseSetFactory()
-    #     response = AgeWhenStartedSmokingResponse(response_set=response_set)
-    #     form = AgeWhenStartedSmokingForm(instance=response, data={"value": 70})
-
-    #     self.assertFalse(form.is_valid())
-    #     self.assertEqual(
-    #         form.errors["value"],
-    #         [
-    #             '<a href="/date-of-birth">Provide your date of birth</a> before answering this question'
-    #         ],
-    #     )
-
-    # def test_is_invalid_when_age_entered_greater_than_current_age(self):
-    #     form = AgeWhenStartedSmokingForm(instance=self.response, data={"value": 70})
-
-    #     self.assertFalse(form.is_valid())
-
-    #     self.assertEqual(
-    #         form.errors["value"],
-    #         [
-    #             "The age you started smoking must be the same as, or less than your current age"
-    #         ],
-    #     )
-
-    # def test_deletes_periods_when_stopped_smoking_response_if_age_started_smoking_is_changed(
-    #     self,
-    # ):
-    #     self.response.value = 17
-    #     self.response.save()
-
-    #     PeriodsWhenYouStoppedSmokingResponseFactory.create(
-    #         response_set=self.response_set,
-    #         value=True,
-    #         duration_years=self.response.years_smoked_including_stopped() - 1,
-    #     )
-    #     form = AgeWhenStartedSmokingForm(instance=self.response, data={"value": 18})
-    #     form.save()
-
-    #     self.assertFalse(
-    #         PeriodsWhenYouStoppedSmokingResponse.objects.filter(
-    #             response_set=self.response_set
-    #         ).exists()
-    #     )
-
-    # def test_does_not_delete_periods_when_stopped_smoking_response_if_age_started_smoking_is_not_changed(
-    #     self,
-    # ):
-    #     self.response.value = 18
-    #     self.response.save()
-
-    #     PeriodsWhenYouStoppedSmokingResponseFactory.create(
-    #         response_set=self.response_set,
-    #         value=True,
-    #         duration_years=self.response.years_smoked_including_stopped() - 1,
-    #     )
-    #     form = AgeWhenStartedSmokingForm(instance=self.response, data={"value": 18})
-    #     form.save()
-
-    #     self.assertTrue(
-    #         PeriodsWhenYouStoppedSmokingResponse.objects.filter(
-    #             response_set=self.response_set
-    #         ).exists()
-    #     )
+    def test_is_invalid_if_no_date_of_birth(self):
+        response_set = ResponseSetFactory()
+        response = WhenYouQuitSmokingResponse(response_set=response_set)
+        form = WhenYouQuitSmokingForm(instance=response, data={"value": 70})
+
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["value"],
+            [
+                '<a href="/date-of-birth">Provide your date of birth</a> before answering when you quit smoking'
+            ],
+        )
+
+    def test_is_invalid_when_age_entered_greater_than_current_age(self):
+        form = WhenYouQuitSmokingForm(instance=self.response, data={"value": 80})
+
+        self.assertFalse(form.is_valid())
+
+        self.assertEqual(
+            form.errors["value"],
+            [
+                "The age you quit smoking must be the same as, or less than, your current age"
+            ],
+        )
+
+    def test_deletes_periods_when_stopped_smoking_response_if_age_started_smoking_is_changed(
+        self,
+    ):
+        self.response.value = self.age_when_started_smoking_response.value + 2
+        self.response.save()
+
+        PeriodsWhenYouStoppedSmokingResponseFactory.create(
+            response_set=self.response_set,
+            value=True,
+            duration_years=self.age_when_started_smoking_response.years_smoked_including_stopped() - 1,
+        )
+        form = AgeWhenStartedSmokingForm(instance=self.response, data={"value": self.date_of_birth_response.age_in_years() - 20})
+        form.save()
+
+        self.assertFalse(
+            PeriodsWhenYouStoppedSmokingResponse.objects.filter(
+                response_set=self.response_set
+            ).exists()
+        )
+
+
+    def test_does_not_delete_periods_when_stopped_smoking_response_if_age_started_smoking_is_not_changed(
+        self,
+    ):
+        self.response.value = self.age_when_started_smoking_response.value + 1
+        self.response.save()
+
+        PeriodsWhenYouStoppedSmokingResponseFactory.create(
+            response_set=self.response_set,
+            value=True,
+            duration_years=self.age_when_started_smoking_response.years_smoked_including_stopped() - 1,
+        )
+
+        form = AgeWhenStartedSmokingForm(instance=self.response, data={"value": self.age_when_started_smoking_response.value + 1})
+        form.save()
+
+        self.assertTrue(
+            PeriodsWhenYouStoppedSmokingResponse.objects.filter(
+                response_set=self.response_set
+            ).exists()
+        )
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_age_when_started_smoking_response.py b/lung_cancer_screening/questions/tests/unit/models/test_age_when_started_smoking_response.py
@@ -4,6 +4,8 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
+from ...factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
+
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
 from ...factories.date_of_birth_response_factory import DateOfBirthResponseFactory
@@ -18,6 +20,7 @@ def setUp(self):
             response_set=self.response_set,
             value=datetime.now() - relativedelta(years=60)
         )
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
 
     def test_has_a_valid_factory(self):
         model = AgeWhenStartedSmokingResponseFactory.build(response_set=self.response_set)
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_periods_when_you_stopped_smoking_response.py b/lung_cancer_screening/questions/tests/unit/models/test_periods_when_you_stopped_smoking_response.py
@@ -3,6 +3,8 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
+from ...factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
+
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.periods_when_you_stopped_smoking_response_factory import PeriodsWhenYouStoppedSmokingResponseFactory
 from ...factories.date_of_birth_response_factory import DateOfBirthResponseFactory
@@ -16,6 +18,7 @@ class TestPeriodsWhenYouStoppedSmokingResponse(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()
 
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
         # Following responses required by validator
         self.date_of_birth_response = DateOfBirthResponseFactory.create(response_set=self.response_set)
         self.age_when_started_smoking_response = AgeWhenStartedSmokingResponseFactory.create(response_set=self.response_set)
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_smoked_total_years_response.py b/lung_cancer_screening/questions/tests/unit/models/test_smoked_total_years_response.py
@@ -1,6 +1,8 @@
 from django.test import TestCase, tag
 from django.core.exceptions import ValidationError
 
+from ...factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
+
 from ...factories.tobacco_smoking_history_factory import TobaccoSmokingHistoryFactory
 from ...factories.smoked_total_years_response_factory import SmokedTotalYearsResponseFactory
 from ...factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
@@ -10,6 +12,7 @@
 class TestSmokedTotalYearsResponse(TestCase):
     def setUp(self):
         self.tobacco_smoking_history = TobaccoSmokingHistoryFactory()
+        HaveYouEverSmokedResponseFactory(response_set=self.tobacco_smoking_history.response_set, current_smoker=True)
         self.age_started_smoking_response = AgeWhenStartedSmokingResponseFactory.create(
             response_set=self.tobacco_smoking_history.response_set
         )
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_tobacco_smoking_history.py b/lung_cancer_screening/questions/tests/unit/models/test_tobacco_smoking_history.py
@@ -1,6 +1,8 @@
 from django.test import TestCase, tag
 from django.core.exceptions import ValidationError
 
+from ...factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
+
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
 from ...factories.tobacco_smoking_history_factory import TobaccoSmokingHistoryFactory
@@ -15,6 +17,7 @@
 class TestTobaccoSmokingHistory(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
 
 
     def test_has_a_valid_factory(self):
diff --git a/lung_cancer_screening/questions/tests/unit/presenters/test_response_set_presenter.py b/lung_cancer_screening/questions/tests/unit/presenters/test_response_set_presenter.py
@@ -73,7 +73,7 @@ def test_periods_when_you_stopped_smoking_with_no_value(self):
     def test_periods_when_you_stopped_smoking_with_value(self):
         DateOfBirthResponseFactory(response_set=self.response_set)
         age_when_started_smoking_response = AgeWhenStartedSmokingResponseFactory(response_set=self.response_set)
-
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
         periods_when_you_stopped_smoking_response = PeriodsWhenYouStoppedSmokingResponseFactory(
             response_set=self.response_set,
             value=True,
diff --git a/lung_cancer_screening/questions/tests/unit/presenters/test_tobacco_smoking_history_presenter.py b/lung_cancer_screening/questions/tests/unit/presenters/test_tobacco_smoking_history_presenter.py
@@ -1,5 +1,6 @@
 from django.test import TestCase
 
+from lung_cancer_screening.questions.tests.factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
 from lung_cancer_screening.questions.tests.factories.response_set_factory import ResponseSetFactory
 from lung_cancer_screening.questions.tests.factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
 from lung_cancer_screening.questions.tests.factories.tobacco_smoking_history_factory import TobaccoSmokingHistoryFactory
@@ -15,6 +16,7 @@
 class TestTobaccoSmokingHistoryPresenter(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory.create()
+        HaveYouEverSmokedResponseFactory(response_set=self.response_set, current_smoker=True)
         self.age_when_started_smoking_response = AgeWhenStartedSmokingResponseFactory.create(
             response_set=self.response_set
         )

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ def __init__(self, args, *kwargs):`
`25`	`25`	`"min_value":"The age you quit smoking must be between 1 and your current age",`
`26`	`26`	`"age_when_quit_smoking_greater_than_age_started":"The age you quit smoking cannot be lower than the age you started smoking",`
`27`	`27`	`"age_when_quit_smoking_greater_than_current_age" : "The age you quit smoking must be the same as, or less than, your current age",`
`28`		`- "no_date_of_birth" : format_html("<a href=\"{}\">Provide your date of birth</a> before answering this question", reverse_lazy("questions:date_of_birth"))`
	`28`	`+ "no_date_of_birth" : format_html("<a href=\"{}\">Provide your date of birth</a> before answering when you quit smoking", reverse_lazy("questions:date_of_birth"))`
`29`	`29`	`}`
`30`	`30`	`)`