resolved merge conflicts

This commit is contained in:
CocoByte 2024-12-25 20:29:19 -07:00
commit 8482ecc7e7
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
2 changed files with 100 additions and 42 deletions

View file

@ -1733,9 +1733,6 @@ class TestDomainRequestAdmin(MockEppLib):
"cisa_representative_first_name",
"cisa_representative_last_name",
"cisa_representative_email",
"requested_suborganization",
"suborganization_city",
"suborganization_state_territory",
]
self.assertEqual(readonly_fields, expected_fields)
@ -1970,6 +1967,7 @@ class TestDomainRequestAdmin(MockEppLib):
# Grab the current list of table filters
readonly_fields = self.admin.get_list_filter(request)
expected_fields = (
DomainRequestAdmin.PortfolioFilter,
DomainRequestAdmin.StatusListFilter,
DomainRequestAdmin.GenericOrgFilter,
DomainRequestAdmin.FederalTypeFilter,