update tests for structured previous service and statement preview

Co-Authored-By: Codex <codex@openai.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: 3 people

apps/nominations/tests/test_forms.py

@@ -4,10 +4,10 @@
 
 from apps.nominations.forms import (
     BoardNominationCreateForm,
+    NominationForm,
     PackagingCouncilNominationCreateForm,
-    PackagingCouncilNominationEditForm,
 )
-from apps.nominations.models import Election
+from apps.nominations.models import Election, Nomination
 from apps.nominations.tests.utils import nomination_payload, packaging_council_kind
 from apps.users.factories import UserFactory
 
@@ -55,6 +55,26 @@ def test_has_no_eligibility_field(self):
         self.assertNotIn("eligibility_confirmed", form.fields)
         self.assertEqual(form.acknowledgment_field_names, ("coc_acknowledged", "mission_alignment"))
 
+    def test_no_previous_service_stores_new_member(self):
+        form = self._form(nomination_payload())
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.instance.previous_board_service, "New board member")
+
+    def test_previous_service_yes_requires_years(self):
+        form = self._form(nomination_payload(previous_service="yes"))
+        self.assertFalse(form.is_valid())
+        self.assertIn("previous_service_years", form.errors)
+
+    def test_previous_service_years_compose_stored_value(self):
+        form = self._form(nomination_payload(previous_service="yes", previous_service_years=["2021", "2019"]))
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.instance.previous_board_service, "2019, 2021")
+
+    def test_previous_service_years_reject_invalid_year(self):
+        form = self._form(nomination_payload(previous_service="yes", previous_service_years=["1999"]))
+        self.assertFalse(form.is_valid())
+        self.assertIn("previous_service_years", form.errors)
+
 
 class PackagingCouncilNominationCreateFormTests(TestCase):
     def setUp(self):
@@ -91,7 +111,18 @@ def test_self_nomination_valid_with_both(self):
 
     def test_previous_service_relabeled(self):
         form = self._form(nomination_payload())
-        self.assertEqual(form.fields["previous_board_service"].label, "Previous Packaging Council Service")
+        self.assertEqual(form.fields["previous_service"].label, "Previous Packaging Council Service")
+
+    def test_no_previous_service_stores_pc_new_member(self):
+        form = self._form(nomination_payload())
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.instance.previous_board_service, "New Packaging Council member")
+
+    def test_pc_years_start_at_2025(self):
+        form = self._form(nomination_payload())
+        years = [choice for choice, _ in form.fields["previous_service_years"].choices]
+        self.assertNotIn("2024", years)
+        self.assertIn("2025", years)
 
     def test_hide_previous_service_removes_field(self):
         election = Election.objects.create(
@@ -101,13 +132,14 @@ def test_hide_previous_service_removes_field(self):
             hide_previous_service=True,
         )
         data = nomination_payload()
-        del data["previous_board_service"]
+        del data["previous_service"]
         form = self._form(data, election=election)
-        self.assertNotIn("previous_board_service", form.fields)
+        self.assertNotIn("previous_service", form.fields)
+        self.assertNotIn("previous_service_years", form.fields)
         self.assertTrue(form.is_valid(), form.errors)
 
 
-class PackagingCouncilNominationEditFormTests(TestCase):
+class NominationEditFormTests(TestCase):
     def setUp(self):
         self.kind = packaging_council_kind()
 
@@ -120,9 +152,20 @@ def _election(self, **extra):
         )
 
     def test_relabels_previous_service(self):
-        form = PackagingCouncilNominationEditForm(election=self._election())
-        self.assertEqual(form.fields["previous_board_service"].label, "Previous Packaging Council Service")
+        form = NominationForm(election=self._election())
+        self.assertEqual(form.fields["previous_service"].label, "Previous Packaging Council Service")
 
     def test_hides_previous_service_when_opted_out(self):
-        form = PackagingCouncilNominationEditForm(election=self._election(hide_previous_service=True))
-        self.assertNotIn("previous_board_service", form.fields)
+        form = NominationForm(election=self._election(hide_previous_service=True))
+        self.assertNotIn("previous_service", form.fields)
+
+    def test_prefills_years_from_stored_free_text(self):
+        nomination = Nomination(previous_board_service="Served 2025 and 2026")
+        form = NominationForm(instance=nomination, election=self._election())
+        self.assertEqual(form.fields["previous_service"].initial, "yes")
+        self.assertEqual(form.fields["previous_service_years"].initial, ["2025", "2026"])
+
+    def test_prefills_no_from_stored_new_member(self):
+        nomination = Nomination(previous_board_service="New Packaging Council member")
+        form = NominationForm(instance=nomination, election=self._election())
+        self.assertEqual(form.fields["previous_service"].initial, "no")

apps/nominations/tests/test_views.py

@@ -116,6 +116,41 @@ def test_packaging_council_self_nomination_requires_eligibility(self):
         self.assertTrue(nomination.eligibility_confirmed)
 
 
+class NominationStatementPreviewTests(TestCase):
+    def test_renders_markdown_with_html_escaped(self):
+        self.client.force_login(UserFactory())
+        response = self.client.post(
+            reverse("nominations:nomination_preview"),
+            {"text": "**bold** <script>alert(1)</script>"},
+        )
+        self.assertEqual(response.status_code, 200)
+        html = response.json()["html"]
+        self.assertIn("<strong>bold</strong>", html)
+        self.assertNotIn("<script>", html)
+
+    def test_requires_login(self):
+        response = self.client.post(reverse("nominations:nomination_preview"), {"text": "hi"})
+        self.assertEqual(response.status_code, 302)
+
+
+class NominationPermissionTests(TestCase):
+    def test_non_owner_gets_403_not_redirect_loop(self):
+        owner = UserFactory(first_name="Nina", last_name="Nominator")
+        other = UserFactory()
+        election = open_election("2026 Board Election")
+        nomination = Nomination.objects.create(
+            election=election,
+            nominator=owner,
+            name="Grace Hopper",
+            email="grace@example.com",
+            nomination_statement="A strong candidate.",
+        )
+        self.client.force_login(other)
+        url = reverse("nominations:nomination_edit", kwargs={"election": election.slug, "pk": nomination.pk})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 403)
+
+
 class NominationEditVariantTests(TestCase):
     def setUp(self):
         self.user = UserFactory()

apps/nominations/tests/utils.py

@@ -33,7 +33,7 @@ def nomination_payload(**overrides):
     data = {
         "name": "Grace Hopper",
         "email": "grace@example.com",
-        "previous_board_service": "New board member",
+        "previous_service": "no",
         "employer": "US Navy",
         "other_affiliations": "",
         "nomination_statement": "A strong candidate.",