attempted to fix conflicts

This commit is contained in:
asaki222 2024-11-03 19:28:16 -05:00
commit a1055687c4
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
35 changed files with 1745 additions and 204 deletions

View file

@ -1652,6 +1652,9 @@ class TestDomainRequestAdmin(MockEppLib):
'action_needed_reason_email',
'federal_agency', 'portfolio',
'sub_organization',
"requested_suborganization",
"suborganization_city",
"suborganization_state_territory",
'creator',
'investigator',
'generic_org_type',
@ -1696,7 +1699,7 @@ class TestDomainRequestAdmin(MockEppLib):
request.user = self.staffuser
readonly_fields = self.admin.get_readonly_fields(request)
self.maxDiff = None
expected_fields = [
'other_contacts',
'current_websites',
@ -1727,6 +1730,9 @@ 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)