Merge branch 'main' into za/2146-remove-generic-org

This commit is contained in:
zandercymatics 2024-05-23 12:34:24 -06:00
commit 59dfb974c1
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
8 changed files with 166 additions and 53 deletions

View file

@ -2231,6 +2231,7 @@ class TestDomainRequestAdmin(MockEppLib):
"current_websites",
"alternative_domains",
"is_election_board",
"federal_agency",
"id",
"created_at",
"updated_at",
@ -2284,6 +2285,7 @@ class TestDomainRequestAdmin(MockEppLib):
"current_websites",
"alternative_domains",
"is_election_board",
"federal_agency",
"creator",
"about_your_organization",
"requested_domain",
@ -2311,6 +2313,7 @@ class TestDomainRequestAdmin(MockEppLib):
"current_websites",
"alternative_domains",
"is_election_board",
"federal_agency",
]
self.assertEqual(readonly_fields, expected_fields)
@ -3168,6 +3171,7 @@ class TestDomainInformationAdmin(TestCase):
expected_fields = [
"other_contacts",
"is_election_board",
"federal_agency",
"creator",
"type_of_work",
"more_organization_information",
@ -3530,7 +3534,7 @@ class TestMyUserAdmin(TestCase):
)
},
),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
("Permissions", {"fields": ("is_active", "groups")}),
("Important dates", {"fields": ("last_login", "date_joined")}),
)