Fix unit tests

src/registrar/fixtures_domain_requests.py

@@ -3,14 +3,7 @@ import random
 from faker import Faker
 from django.db import transaction
 
-from registrar.models import (
-    User,
-    DomainRequest,
-    DraftDomain,
-    Contact,
-    Website,
-    FederalAgency
-)
+from registrar.models import User, DomainRequest, DraftDomain, Contact, Website, FederalAgency
 
 fake = Faker()
 logger = logging.getLogger(__name__)

src/registrar/tests/common.py

@@ -26,7 +26,7 @@ from registrar.models import (
     DomainInformation,
     PublicContact,
     Domain,
-    FederalAgency
+    FederalAgency,
 )
 from epplibwrapper import (
     commands,

src/registrar/tests/test_admin.py

@@ -1989,6 +1989,7 @@ class TestDomainRequestAdmin(MockEppLib):
                 "updated_at",
                 "status",
                 "rejection_reason",
+                "federal_agency",
                 "creator",
                 "investigator",
                 "generic_org_type",
@@ -1997,7 +1998,6 @@ class TestDomainRequestAdmin(MockEppLib):
                 "federally_recognized_tribe",
                 "state_recognized_tribe",
                 "tribe_name",
-                "federal_agency",
                 "federal_type",
                 "organization_name",
                 "address_line1",

src/registrar/tests/test_transition_domain_migrations.py

@@ -11,7 +11,7 @@ from registrar.models import (
     TransitionDomain,
     DomainInformation,
     UserDomainRole,
-    FederalAgency
+    FederalAgency,
 )
 
 from django.core.management import call_command
@@ -815,7 +815,7 @@ class TestMigrations(TestCase):
             fakewebsite = fakewebsite_domain_infos.get()
             self.assertEqual(fakewebsite.organization_name, "Fanoodle")
             self.assertEqual(fakewebsite.generic_org_type, "federal")
-            self.assertEqual(fakewebsite.federal_agency, "Department of Commerce")
+            self.assertEqual(fakewebsite.federal_agency.agency, "Department of Commerce")
             self.assertEqual(fakewebsite.federal_type, "executive")
 
             ao = fakewebsite.authorizing_official

src/registrar/tests/test_views_domain.py

@@ -31,6 +31,7 @@ from registrar.models import (
     HostIP,
     UserDomainRole,
     User,
+    FederalAgency,
 )
 from datetime import date, datetime, timedelta
 from django.utils import timezone
@@ -1426,7 +1427,8 @@ class TestDomainOrganization(TestDomainOverview):
         self.domain_information.generic_org_type = fed_org_type
         self.domain_information.save()
         try:
-            self.domain_information.federal_agency = "AMTRAK"
+            federal_agency, _ = FederalAgency.objects.get_or_create(agency="AMTRAK")
+            self.domain_information.federal_agency = federal_agency
             self.domain_information.save()
         except ValueError as err:
             self.fail(f"A ValueError was caught during the test: {err}")
@@ -1482,7 +1484,9 @@ class TestDomainOrganization(TestDomainOverview):
         self.domain_information.generic_org_type = federal_org_type
         self.domain_information.save()
 
-        old_federal_agency_value = ("AMTRAK", "AMTRAK")
+        federal_agency, _ = FederalAgency.objects.get_or_create(agency="AMTRAK")
+
+        old_federal_agency_value = (federal_agency, federal_agency)
         try:
             # Add a federal agency. Defined as a tuple since this list may change order.
             self.domain_information.federal_agency = old_federal_agency_value

src/registrar/tests/test_views_request.py

@@ -16,7 +16,7 @@ from registrar.models import (
     Contact,
     User,
     Website,
-    FederalAgency
+    FederalAgency,
 )
 from registrar.views.domain_request import DomainRequestWizard, Step