update tests: use absolute imports and Fellow model

JacobCoffee · claude · JacobCoffee · commit 6d1e44bfb199 · 2026-02-05T22:15:38.000-06:00
Replace relative dot imports with absolute `nominations.tests.factories`
imports. Migrate test assertions from Membership to Fellow model. Fix
nomination_statement min-length in test data.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/nominations/tests/test_forms.py b/nominations/tests/test_forms.py
@@ -4,7 +4,7 @@
 
 from nominations.forms import FellowNominationForm
 from nominations.models import FellowNominationRound
-from .factories import UserFactory, FellowNominationRoundFactory
+from nominations.tests.factories import UserFactory, FellowNominationRoundFactory
 
 
 class FellowNominationFormTests(TestCase):
@@ -19,7 +19,7 @@ def test_valid_form(self):
         data = {
             "nominee_name": "Jane Doe",
             "nominee_email": "jane@example.com",
-            "nomination_statement": "Great contributor to Python.",
+            "nomination_statement": "Jane has made outstanding contributions to the Python community through years of dedicated work on documentation, mentoring, and conference organization.",
             "nomination_statement_markup_type": "markdown",
         }
         form = FellowNominationForm(data=data, request=self.request)
diff --git a/nominations/tests/test_management_views.py b/nominations/tests/test_management_views.py
@@ -5,7 +5,7 @@
 from django.contrib.auth.models import Group
 
 from nominations.models import FellowNomination, FellowNominationRound
-from .factories import (
+from nominations.tests.factories import (
     UserFactory,
     FellowNominationRoundFactory,
     FellowNominationFactory,
diff --git a/nominations/tests/test_models.py b/nominations/tests/test_models.py
@@ -4,14 +4,13 @@
 from django.test import TestCase
 from django.utils import timezone
 
-from users.models import Membership
-
 from nominations.models import (
+    Fellow,
     FellowNominationRound,
     FellowNomination,
     FellowNominationVote,
 )
-from .factories import (
+from nominations.tests.factories import (
     UserFactory,
     FellowNominationRoundFactory,
     FellowNominationFactory,
@@ -153,35 +152,21 @@ def test_nominee_is_already_fellow_false_no_user(self):
         self.nomination.nominee_user = None
         self.assertFalse(self.nomination.nominee_is_already_fellow)
 
-    def test_nominee_is_already_fellow_false_no_membership(self):
+    def test_nominee_is_already_fellow_false_no_fellow_record(self):
         nominee_user = UserFactory()
         self.nomination.nominee_user = nominee_user
         self.assertFalse(self.nomination.nominee_is_already_fellow)
 
     def test_nominee_is_already_fellow_true(self):
         nominee_user = UserFactory()
-        Membership.objects.create(
-            creator=nominee_user,
-            membership_type=Membership.FELLOW,
-            legal_name="Test Fellow",
-            preferred_name="Test",
-            email_address=nominee_user.email,
+        Fellow.objects.create(
+            name="Test Fellow",
+            year_elected=2020,
+            user=nominee_user,
         )
         self.nomination.nominee_user = nominee_user
         self.assertTrue(self.nomination.nominee_is_already_fellow)
 
-    def test_nominee_is_already_fellow_false_basic_member(self):
-        nominee_user = UserFactory()
-        Membership.objects.create(
-            creator=nominee_user,
-            membership_type=Membership.BASIC,
-            legal_name="Test Basic",
-            preferred_name="Test",
-            email_address=nominee_user.email,
-        )
-        self.nomination.nominee_user = nominee_user
-        self.assertFalse(self.nomination.nominee_is_already_fellow)
-
 
 class FellowNominationVoteResultTests(TestCase):
     def setUp(self):
diff --git a/nominations/tests/test_review_views.py b/nominations/tests/test_review_views.py
@@ -7,7 +7,7 @@
 from django.contrib.auth.models import Group
 
 from nominations.models import FellowNomination, FellowNominationVote
-from .factories import (
+from nominations.tests.factories import (
     UserFactory,
     FellowNominationRoundFactory,
     FellowNominationFactory,
diff --git a/nominations/tests/test_roster_views.py b/nominations/tests/test_roster_views.py
@@ -1,9 +1,7 @@
 from django.test import TestCase, Client
 from django.urls import reverse
 
-from users.models import Membership
-
-from .factories import UserFactory
+from nominations.models import Fellow
 
 
 class FellowsRosterViewTests(TestCase):
@@ -23,62 +21,18 @@ def test_alt_url_works(self):
         self.assertEqual(response.status_code, 200)
 
     def test_only_fellows_shown(self):
-        """Only members with membership_type=FELLOW should appear on the roster."""
-        fellow_user = UserFactory(first_name="Alice", last_name="Fellow")
-        Membership.objects.create(
-            creator=fellow_user,
-            membership_type=Membership.FELLOW,
-            legal_name="Alice Fellow",
-            preferred_name="Alice",
-            email_address=fellow_user.email,
-        )
-        basic_user = UserFactory(first_name="Bob", last_name="Basic")
-        Membership.objects.create(
-            creator=basic_user,
-            membership_type=Membership.BASIC,
-            legal_name="Bob Basic",
-            preferred_name="Bob",
-            email_address=basic_user.email,
-        )
-        supporting_user = UserFactory(first_name="Carol", last_name="Supporter")
-        Membership.objects.create(
-            creator=supporting_user,
-            membership_type=Membership.SUPPORTING,
-            legal_name="Carol Supporter",
-            preferred_name="Carol",
-            email_address=supporting_user.email,
-        )
+        """All Fellow records should appear on the roster."""
+        Fellow.objects.create(name="Alice Fellow", year_elected=2020, status="active")
+        Fellow.objects.create(name="Bob Emeritus", year_elected=2015, status="emeritus")
         response = self.client.get(self.url)
         self.assertContains(response, "Alice Fellow")
-        self.assertNotContains(response, "Bob Basic")
-        self.assertNotContains(response, "Carol Supporter")
+        self.assertContains(response, "Bob Emeritus")
 
     def test_alphabetical_ordering(self):
-        """Fellows should be ordered by last name, then first name."""
-        user_z = UserFactory(first_name="Zara", last_name="Zebra")
-        Membership.objects.create(
-            creator=user_z,
-            membership_type=Membership.FELLOW,
-            legal_name="Zara Zebra",
-            preferred_name="Zara",
-            email_address=user_z.email,
-        )
-        user_a = UserFactory(first_name="Alice", last_name="Alpha")
-        Membership.objects.create(
-            creator=user_a,
-            membership_type=Membership.FELLOW,
-            legal_name="Alice Alpha",
-            preferred_name="Alice",
-            email_address=user_a.email,
-        )
-        user_m = UserFactory(first_name="Mike", last_name="Middle")
-        Membership.objects.create(
-            creator=user_m,
-            membership_type=Membership.FELLOW,
-            legal_name="Mike Middle",
-            preferred_name="Mike",
-            email_address=user_m.email,
-        )
+        """Fellows should be ordered by name."""
+        Fellow.objects.create(name="Zara Zebra", year_elected=2020, status="active")
+        Fellow.objects.create(name="Alice Alpha", year_elected=2019, status="active")
+        Fellow.objects.create(name="Mike Middle", year_elected=2018, status="active")
         response = self.client.get(self.url)
         content = response.content.decode()
         pos_alice = content.index("Alice Alpha")
@@ -90,52 +44,62 @@ def test_alphabetical_ordering(self):
     def test_total_count_in_context(self):
         """The context should include the total count of Fellows."""
         for i in range(3):
-            user = UserFactory(first_name=f"Fellow{i}", last_name=f"User{i}")
-            Membership.objects.create(
-                creator=user,
-                membership_type=Membership.FELLOW,
-                legal_name=f"Fellow{i} User{i}",
-                preferred_name=f"Fellow{i}",
-                email_address=user.email,
+            Fellow.objects.create(
+                name=f"Fellow{i} User{i}", year_elected=2020, status="active"
             )
         response = self.client.get(self.url)
         self.assertEqual(response.context["total_count"], 3)
-        self.assertContains(response, "3")
 
     def test_empty_roster(self):
         """When there are no Fellows, an appropriate message should be shown."""
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "No PSF Fellows found")
 
-    def test_fellow_with_location(self):
-        """Fellow with city and country should display location info."""
-        user = UserFactory(first_name="Located", last_name="Fellow")
-        Membership.objects.create(
-            creator=user,
-            membership_type=Membership.FELLOW,
-            legal_name="Located Fellow",
-            preferred_name="Located",
-            email_address=user.email,
-            city="Portland",
-            country="USA",
+    def test_year_displayed(self):
+        """Fellow year elected should be displayed in parentheses."""
+        Fellow.objects.create(name="Year Fellow", year_elected=2019, status="active")
+        response = self.client.get(self.url)
+        self.assertContains(response, "Year Fellow (2019)")
+
+    def test_emeritus_year_displayed(self):
+        """Emeritus fellows should show both elected and emeritus year."""
+        Fellow.objects.create(
+            name="Old Fellow", year_elected=2005, status="emeritus", emeritus_year=2020
         )
         response = self.client.get(self.url)
-        self.assertContains(response, "Portland")
-        self.assertContains(response, "USA")
+        self.assertContains(response, "Old Fellow (2005/2020)")
 
-    def test_fellow_without_location(self):
-        """Fellow without city/country should still render without errors."""
-        user = UserFactory(first_name="NoLoc", last_name="Fellow")
-        Membership.objects.create(
-            creator=user,
-            membership_type=Membership.FELLOW,
-            legal_name="NoLoc Fellow",
-            preferred_name="NoLoc",
-            email_address=user.email,
-            city="",
-            country="",
+    def test_deceased_notes_displayed(self):
+        """Deceased fellows should show notes if present."""
+        Fellow.objects.create(
+            name="Remembered Fellow",
+            year_elected=2010,
+            status="deceased",
+            notes="A great contributor.",
         )
         response = self.client.get(self.url)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "NoLoc Fellow")
+        self.assertContains(response, "Remembered Fellow")
+        self.assertContains(response, "A great contributor.")
+
+    def test_sections_in_context(self):
+        """Context should include separate querysets for each status."""
+        Fellow.objects.create(name="Active One", year_elected=2020, status="active")
+        Fellow.objects.create(name="Active Two", year_elected=2019, status="active")
+        Fellow.objects.create(name="Emeritus One", year_elected=2010, status="emeritus")
+        Fellow.objects.create(name="Deceased One", year_elected=2005, status="deceased")
+        response = self.client.get(self.url)
+        self.assertEqual(response.context["active_count"], 2)
+        self.assertEqual(response.context["emeritus_count"], 1)
+        self.assertEqual(response.context["deceased_count"], 1)
+        self.assertEqual(response.context["total_count"], 4)
+
+    def test_section_headings_rendered(self):
+        """Each section heading should appear when fellows of that status exist."""
+        Fellow.objects.create(name="Active Fellow", year_elected=2020, status="active")
+        Fellow.objects.create(name="Emeritus Fellow", year_elected=2010, status="emeritus")
+        Fellow.objects.create(name="Deceased Fellow", year_elected=2005, status="deceased")
+        response = self.client.get(self.url)
+        self.assertContains(response, "Fellows (1)")
+        self.assertContains(response, "Emeritus Fellows (1)")
+        self.assertContains(response, "In Memoriam (1)")
diff --git a/nominations/tests/test_views.py b/nominations/tests/test_views.py
@@ -6,10 +6,8 @@
 from django.utils import timezone
 from django.contrib.auth.models import Group
 
-from users.models import Membership
-
-from nominations.models import FellowNomination, FellowNominationRound
-from .factories import (
+from nominations.models import Fellow, FellowNomination, FellowNominationRound
+from nominations.tests.factories import (
     UserFactory,
     FellowNominationRoundFactory,
     FellowNominationFactory,
@@ -58,7 +56,7 @@ def test_successful_submission(self, mock_now, mock_wg_notify, mock_nominator_no
         data = {
             "nominee_name": "Jane Doe",
             "nominee_email": "jane@example.com",
-            "nomination_statement": "Great contributions.",
+            "nomination_statement": "Jane has made outstanding contributions to the Python community through years of dedicated work on documentation, mentoring, and conference organization.",
             "nomination_statement_markup_type": "markdown",
         }
         response = self.client.post(self.url, data)
@@ -76,17 +74,15 @@ def test_fellow_warning_shown(self, mock_now, mock_wg_notify, mock_nominator_not
             datetime.datetime(2026, 1, 15, 12, 0)
         )
         fellow_user = UserFactory(email="fellow@example.com")
-        Membership.objects.create(
-            creator=fellow_user,
-            membership_type=Membership.FELLOW,
-            legal_name="Fellow User",
-            preferred_name="Fellow",
-            email_address="fellow@example.com",
+        Fellow.objects.create(
+            name="Fellow User",
+            year_elected=2020,
+            user=fellow_user,
         )
         data = {
             "nominee_name": "Fellow User",
             "nominee_email": "fellow@example.com",
-            "nomination_statement": "Already a fellow.",
+            "nomination_statement": "This person has been an incredible contributor to the Python community through years of sustained effort across multiple projects and initiatives.",
             "nomination_statement_markup_type": "markdown",
         }
         response = self.client.post(self.url, data, follow=True)
