PR Review Fixes

Author: cameronhargreaves1-nhs

manage_breast_screening/auth/tests/factories.py

@@ -1,7 +1,10 @@
 from django.contrib.auth import get_user_model
+from factory import Trait
 from factory.declarations import Sequence
 from factory.django import DjangoModelFactory
 
+from manage_breast_screening.auth.models import Role
+
 
 class UserFactory(DjangoModelFactory):
     class Meta:
@@ -12,3 +15,7 @@ class Meta:
     nhs_uid = Sequence(lambda n: "alice%d" % n)
     first_name = Sequence(lambda n: "Alice%d" % n)
     last_name = "Lastname"
+
+    class Params:
+        clinical = Trait(roles=[Role.CLINICAL])
+        administrative = Trait(roles=[Role.ADMINISTRATIVE])

manage_breast_screening/tests/system/clinical/test_clinic_show_page.py

@@ -265,7 +265,6 @@ def then_i_can_see_the_special_appointment_banner(self):
 
     def and_there_are_appointments_in_various_states_with_attributed_users(self):
         # Create users for attribution
-        user_in_progress = UserFactory(first_name="Alice", last_name="User")
         user_screened = UserFactory(first_name="Bob", last_name="User")
         user_cancelled = UserFactory(first_name="Charlie", last_name="User")
 
@@ -285,7 +284,7 @@ def and_there_are_appointments_in_various_states_with_attributed_users(self):
         )
         self.in_progress_appointment.statuses.create(
             state=AppointmentStatus.IN_PROGRESS,
-            created_by=user_in_progress,
+            created_by=self.user_in_progress,
         )
 
         # SCREENED status
@@ -319,7 +318,7 @@ def then_i_can_see_status_attribution_for_relevant_appointments(self):
         in_progress_row = self.page.locator("tr").filter(
             has_text="Participant InProgress"
         )
-        expect(in_progress_row).to_contain_text("with A. User (you)")
+        expect(in_progress_row).to_contain_text("with A. InProgress (you)")
 
         screened_row = self.page.locator("tr").filter(has_text="Participant Screened")
         expect(screened_row).to_contain_text("by B. User")
@@ -329,8 +328,10 @@ def then_i_can_see_status_attribution_for_relevant_appointments(self):
 
     def given_i_am_logged_in_as_a_user_with_appointment_in_progress(self):
         # Create and log in the user who will be attributed with the IN_PROGRESS status
-        user_in_progress = UserFactory(first_name="Alice", last_name="User")
-        self.login_as_role(Role.CLINICAL, user_in_progress)
+        self.user_in_progress = self.create_user_with_role(
+            first_name="Alice", last_name="InProgress", role=Role.CLINICAL
+        )
+        self.login_as_user(self.user_in_progress)
 
     def then_i_can_see_you_in_status_attribution(self):
         # Check that the "(you)" indicator is present for the in-progress attribution

manage_breast_screening/tests/system/system_test_setup.py

@@ -46,6 +46,9 @@ def login_as_user(self, user: User):
         Emulate logging in as a particular user, without needing
         to visit a login page.
         """
+
+        self.current_user = user
+
         # Fake a login
         client = Client()
         client.force_login(user)
@@ -69,20 +72,25 @@ def login_as_user(self, user: User):
             ]
         )
 
-    def login_as_role(self, role: Role, user: User | None = None):
+    def login_as_role(self, role: Role):
         """
         Emulate logging in as a user having a particular role,
         without needing to visit a login page.
         """
-        if not user:
-            user = UserFactory.create()
+        user = UserFactory.create()
 
         UserAssignmentFactory.create(user=user, roles=[role.value])
 
-        self.current_user = user
         self.current_provider = user.assignments.first().provider
         self.login_as_user(user)
 
+    def create_user_with_role(
+        self, first_name: str, last_name: str, role: Role
+    ) -> User:
+        user = UserFactory.create(first_name=first_name, last_name=last_name)
+        UserAssignmentFactory.create(user=user, roles=[role.value])
+        return user
+
     def expect_validation_error(
         self,
         error_text: str,