From 96b929834f160119531af5b80956db3c44b0fdb3 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 26 Jan 2024 11:35:09 -0500
Subject: [PATCH 1/2] fixed broken test in test_admin

---
 src/registrar/tests/test_admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 43771a260..4bc532f10 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1766,7 +1766,7 @@ class ContactAdminTest(TestCase):
                 f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application2.pk}/change/'>city2.gov</a><br/>"
                 f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application3.pk}/change/'>city3.gov</a><br/>"
                 f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application4.pk}/change/'>city4.gov</a><br/>"
-                "Joined to User: <a href='/admin/registrar/user/2/change/'>staff@example.com</a><br/>",
+                f"Joined to User: <a href='/admin/registrar/user/{self.staffuser.pk}/change/'>staff@example.com</a><br/>",
             )
 
     def test_change_view_for_joined_contact_five_or_more(self):

From 39cff906a796dd5d2d8dc77fea5590470de4c65a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 26 Jan 2024 11:41:04 -0500
Subject: [PATCH 2/2] linting

---
 src/registrar/tests/test_admin.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 4bc532f10..796e22b59 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1762,11 +1762,16 @@ class ContactAdminTest(TestCase):
             # Note: The 5th join will be a user.
             mock_warning.assert_called_once_with(
                 response.wsgi_request,
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application1.pk}/change/'>city1.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application2.pk}/change/'>city2.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application3.pk}/change/'>city3.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application4.pk}/change/'>city4.gov</a><br/>"
-                f"Joined to User: <a href='/admin/registrar/user/{self.staffuser.pk}/change/'>staff@example.com</a><br/>",
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application1.pk}/change/'>"
+                "city1.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application2.pk}/change/'>"
+                "city2.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application3.pk}/change/'>"
+                "city3.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application4.pk}/change/'>"
+                "city4.gov</a><br/>"
+                f"Joined to User: <a href='/admin/registrar/user/{self.staffuser.pk}/change/'>"
+                "staff@example.com</a><br/>",
             )
 
     def test_change_view_for_joined_contact_five_or_more(self):
@@ -1794,11 +1799,16 @@ class ContactAdminTest(TestCase):
             # Note: The 6th join will be a user.
             mock_warning.assert_called_once_with(
                 response.wsgi_request,
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application1.pk}/change/'>city1.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application2.pk}/change/'>city2.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application3.pk}/change/'>city3.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application4.pk}/change/'>city4.gov</a><br/>"
-                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application5.pk}/change/'>city5.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application1.pk}/change/'>"
+                "city1.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application2.pk}/change/'>"
+                "city2.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application3.pk}/change/'>"
+                "city3.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application4.pk}/change/'>"
+                "city4.gov</a><br/>"
+                f"Joined to DomainApplication: <a href='/admin/registrar/domainapplication/{application5.pk}/change/'>"
+                "city5.gov</a><br/>"
                 "And 1 more...",
             )