Changes as per Rachael & George's comments.

django_app/redbox_app/redbox_core/views.py

@@ -324,16 +324,16 @@ def get(self, request: HttpRequest) -> HttpResponse:
 class DemographicsForm(forms.ModelForm):
     class Meta:
         model = User
-        fields = ("grade", "profession", "business_unit")
+        fields = ("business_unit", "grade", "profession")
         labels: ClassVar[Mapping[str, str]] = {
+            "business_unit": "Business unit",
             "grade": "Grade",
             "profession": "Profession",
-            "business_unit": "Business unit",
         }
         widgets: ClassVar[Mapping[str, forms.Widget]] = {
+            "business_unit": forms.Select(attrs={"class": "govuk-select"}),
             "grade": forms.Select(attrs={"class": "govuk-select"}),
             "profession": forms.Select(attrs={"class": "govuk-select"}),
-            "business_unit": forms.Select(attrs={"class": "govuk-select"}),
         }
 
 

django_app/tests/conftest.py

@@ -60,7 +60,7 @@ def jemima_puddleduck():
 
 
 @pytest.fixture()
-def mrs_tiggywinkle(business_unit: BusinessUnit) -> User:
+def user_with_demographic_data(business_unit: BusinessUnit) -> User:
     return User.objects.create_user(
         email="[email protected]", grade="DG", business_unit=business_unit, profession="AN"
     )

django_app/tests/test_views.py

@@ -347,9 +347,9 @@ def test_check_demographics_redirect_if_unpopulated(client: Client, alice: User)
 
 
 @pytest.mark.django_db()
-def test_check_demographics_redirect_if_populated(client: Client, mrs_tiggywinkle: User):
+def test_check_demographics_redirect_if_populated(client: Client, user_with_demographic_data: User):
     # Given
-    client.force_login(mrs_tiggywinkle)
+    client.force_login(user_with_demographic_data)
 
     # When
     response = client.get("/check-demographics/", follow=True)
@@ -359,9 +359,9 @@ def test_check_demographics_redirect_if_populated(client: Client, mrs_tiggywinkl
 
 
 @pytest.mark.django_db()
-def test_view_demographic_details_form(client: Client, mrs_tiggywinkle: User):
+def test_view_demographic_details_form(client: Client, user_with_demographic_data: User):
     # Given
-    client.force_login(mrs_tiggywinkle)
+    client.force_login(user_with_demographic_data)
 
     # When
     response = client.get("/demographics/")