Merge branch 'main' into za/1901-allow-analysts-to-customize-action-needed-emails

This commit is contained in:
zandercymatics 2024-07-03 09:11:56 -06:00
commit b93a9b07b7
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
25 changed files with 621 additions and 104 deletions

View file

@ -2262,6 +2262,7 @@ class TestDomainRequestAdmin(MockEppLib):
"action_needed_reason_email",
"federal_agency",
"portfolio",
"sub_organization",
"creator",
"investigator",
"generic_org_type",
@ -3574,7 +3575,7 @@ class TestMyUserAdmin(MockDb):
)
},
),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "title", "email", "phone")}),
("User profile", {"fields": ("first_name", "middle_name", "last_name", "title", "email", "phone")}),
("Permissions", {"fields": ("is_active", "groups")}),
("Important dates", {"fields": ("last_login", "date_joined")}),
)
@ -4065,9 +4066,7 @@ class TestContactAdmin(TestCase):
readonly_fields = self.admin.get_readonly_fields(request)
expected_fields = [
"user",
]
expected_fields = ["user", "email"]
self.assertEqual(readonly_fields, expected_fields)