From 45b8ca358acb6d675bc15cdbb95a6079361d54a8 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 26 Feb 2024 15:14:20 -0500 Subject: [PATCH] updated merge --- src/registrar/admin.py | 1 + src/registrar/tests/test_admin.py | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 151305580..808433100 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -24,6 +24,7 @@ from auditlog.admin import LogEntryAdmin # type: ignore from django_fsm import TransitionNotAllowed # type: ignore from django.utils.safestring import mark_safe from django.utils.html import escape +from django.utils.translation import gettext_lazy as _ logger = logging.getLogger(__name__) diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index c1f357554..17e8c171f 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -1186,13 +1186,13 @@ class TestDomainApplicationAdmin(MockEppLib): self.client.login(username="staffuser", password=p) request = RequestFactory().get("/") - # These names have metadata embedded in them. :investigator implicitly tests if - # these are actually from the attribute "investigator". - expected_list = [ - "AGuy AGuy last_name:investigator", - "FinalGuy FinalGuy last_name:investigator", - "SomeGuy first_name:investigator SomeGuy last_name:investigator", - ] + # These names have metadata embedded in them. :investigator implicitly tests if + # these are actually from the attribute "investigator". + expected_list = [ + "AGuy AGuy last_name:investigator", + "FinalGuy FinalGuy last_name:investigator", + "SomeGuy first_name:investigator SomeGuy last_name:investigator", + ] # Get the actual sorted list of investigators from the lookups method actual_list = [item for _, item in self.admin.InvestigatorFilter.lookups(self, request, self.admin)]