Merge branch 'main' into za/1852-user-contact-info-inline

This commit is contained in:
zandercymatics 2024-03-25 08:24:52 -06:00
commit 3b652cda6c
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
36 changed files with 305 additions and 204 deletions

View file

@ -287,7 +287,7 @@ class TestDomainAdmin(MockEppLib, WebTest):
# for our actual domain_request
self.assertContains(response, "Federal", count=8)
# This may be a bit more robust
self.assertContains(response, '<td class="field-organization_type">Federal</td>', count=1)
self.assertContains(response, '<td class="field-generic_org_type">Federal</td>', count=1)
# Now let's make sure the long description does not exist
self.assertNotContains(response, "Federal: an agency of the U.S. government")
@ -693,7 +693,7 @@ class TestDomainRequestAdmin(MockEppLib):
# for our actual domain request
self.assertContains(response, "Federal", count=6)
# This may be a bit more robust
self.assertContains(response, '<td class="field-organization_type">Federal</td>', count=1)
self.assertContains(response, '<td class="field-generic_org_type">Federal</td>', count=1)
# Now let's make sure the long description does not exist
self.assertNotContains(response, "Federal: an agency of the U.S. government")
@ -1447,7 +1447,7 @@ class TestDomainRequestAdmin(MockEppLib):
"rejection_reason",
"creator",
"investigator",
"organization_type",
"generic_org_type",
"federally_recognized_tribe",
"state_recognized_tribe",
"tribe_name",
@ -1657,7 +1657,7 @@ class TestDomainRequestAdmin(MockEppLib):
readonly_fields = self.admin.get_list_filter(request)
expected_fields = (
"status",
"organization_type",
"generic_org_type",
"federal_type",
DomainRequestAdmin.ElectionOfficeFilter,
"rejection_reason",