zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-13 22:45:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

Finally fixed remaining unit tests (after a long fight with our test outputs)

Browse source
This commit is contained in:
CocoByte 2024-03-05 00:07:51 -07:00
parent f28705daff
commit cea667aae4
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/models/user_group.py
View file

@ -33,8 +33,8 @@ class UserGroup(Group):
}, },
{ {
"app_label": "registrar", "app_label": "registrar",
"model": "DomainRequest", "model": "domainrequest",
"permissions": ["change_DomainRequest"], "permissions": ["change_domainrequest"],
}, },
{ {
"app_label": "registrar", "app_label": "registrar",

48
src/registrar/tests/test_admin.py
View file

@ -293,7 +293,7 @@ class TestDomainAdmin(MockEppLib, WebTest):
Scenario: Domain deletion is unsuccessful Scenario: Domain deletion is unsuccessful
When the domain is deleted When the domain is deleted
Then a user-friendly success message is returned for displaying on the web Then a user-friendly success message is returned for displaying on the web
And `state` is et to `DELETED` And `state` is set to `DELETED`
""" """
with less_console_noise(): with less_console_noise():
domain = create_ready_domain() domain = create_ready_domain()
@ -498,7 +498,7 @@ class TestDomainRequestAdmin(MockEppLib):
factory=self.factory, factory=self.factory,
user=self.superuser, user=self.superuser,
admin=self.admin, admin=self.admin,
url="/admin/registrar/DomainRequest/", url="/admin/registrar/domainrequest/",
model=DomainRequest, model=DomainRequest,
) )
self.mock_client = MockSESClient() self.mock_client = MockSESClient()
@ -600,7 +600,7 @@ class TestDomainRequestAdmin(MockEppLib):
with boto3_mocking.clients.handler_for("sesv2", self.mock_client): with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
with less_console_noise(): with less_console_noise():
# Create a mock request # Create a mock request
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
# Modify the domain request's properties # Modify the domain request's properties
domain_request.status = status domain_request.status = status
@ -998,7 +998,7 @@ class TestDomainRequestAdmin(MockEppLib):
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED) domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
# Create a request object with a superuser # Create a request object with a superuser
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
request.user = self.superuser request.user = self.superuser
with ExitStack() as stack: with ExitStack() as stack:
@ -1026,7 +1026,7 @@ class TestDomainRequestAdmin(MockEppLib):
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED) domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
# Create a request object with a superuser # Create a request object with a superuser
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
request.user = self.superuser request.user = self.superuser
with ExitStack() as stack: with ExitStack() as stack:
@ -1079,7 +1079,7 @@ class TestDomainRequestAdmin(MockEppLib):
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW) domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
# Create a mock request # Create a mock request
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
with boto3_mocking.clients.handler_for("sesv2", self.mock_client): with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
# Modify the domain request's property # Modify the domain request's property
@ -1101,7 +1101,7 @@ class TestDomainRequestAdmin(MockEppLib):
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW) domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
# Create a mock request # Create a mock request
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
with boto3_mocking.clients.handler_for("sesv2", self.mock_client): with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
# Modify the domain request's property # Modify the domain request's property
@ -1233,7 +1233,7 @@ class TestDomainRequestAdmin(MockEppLib):
with patch("django.contrib.messages.warning") as mock_warning: with patch("django.contrib.messages.warning") as mock_warning:
# Create a request object with a superuser # Create a request object with a superuser
request = self.factory.get("/admin/your_app/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.get("/admin/your_app/domainrequest/{}/change/".format(domain_request.pk))
request.user = self.superuser request.user = self.superuser
self.admin.display_restricted_warning(request, domain_request) self.admin.display_restricted_warning(request, domain_request)
@ -1260,7 +1260,7 @@ class TestDomainRequestAdmin(MockEppLib):
domain_request.save() domain_request.save()
# Create a request object with a superuser # Create a request object with a superuser
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
request.user = self.superuser request.user = self.superuser
# Define a custom implementation for is_active # Define a custom implementation for is_active
@ -1403,7 +1403,7 @@ class TestDomainRequestAdmin(MockEppLib):
p = "userpass" p = "userpass"
self.client.login(username="staffuser", password=p) self.client.login(username="staffuser", password=p)
response = self.client.get( response = self.client.get(
"/admin/registrar/DomainRequest/", "/admin/registrar/domainrequest/",
{ {
"investigator__id__exact": investigator_user.id, "investigator__id__exact": investigator_user.id,
}, },
@ -1454,7 +1454,7 @@ class TestDomainRequestAdmin(MockEppLib):
p = "userpass" p = "userpass"
self.client.login(username="staffuser", password=p) self.client.login(username="staffuser", password=p)
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_request.pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
# Get the actual field from the model's meta information # Get the actual field from the model's meta information
investigator_field = DomainRequest._meta.get_field("investigator") investigator_field = DomainRequest._meta.get_field("investigator")
@ -1824,7 +1824,7 @@ class ListHeaderAdminTest(TestCase):
# which handles CSRF # which handles CSRF
# Follow=True handles the redirect # Follow=True handles the redirect
response = self.client.get( response = self.client.get(
"/admin/registrar/DomainRequest/", "/admin/registrar/domainrequest/",
{ {
"status__exact": "started", "status__exact": "started",
"investigator__id__exact": user.id, "investigator__id__exact": user.id,
@ -1909,7 +1909,7 @@ class MyUserAdminTest(TestCase):
self.assertEqual(fieldsets, expected_fieldsets) self.assertEqual(fieldsets, expected_fieldsets)
def test_get_fieldsets_cisa_analyst(self): def test_get_fieldsets_cisa_analyst(self):
with less_console_noise(): if True:
request = self.client.request().wsgi_request request = self.client.request().wsgi_request
request.user = create_user() request.user = create_user()
fieldsets = self.admin.get_fieldsets(request) fieldsets = self.admin.get_fieldsets(request)
@ -1951,7 +1951,7 @@ class AuditedAdminTest(TestCase):
# Create a mock request # Create a mock request
domain_request_request = self.factory.post( domain_request_request = self.factory.post(
"/admin/registrar/DomainRequest/{}/change/".format(domain_requests[0].pk) "/admin/registrar/domainrequest/{}/change/".format(domain_requests[0].pk)
) )
# Get the formfield data from the domain request page # Get the formfield data from the domain request page
@ -1992,7 +1992,7 @@ class AuditedAdminTest(TestCase):
domain_requests = multiple_unalphabetical_domain_objects("domain_request") domain_requests = multiple_unalphabetical_domain_objects("domain_request")
# Create a mock request # Create a mock request
request = self.factory.post("/admin/registrar/DomainRequest/{}/change/".format(domain_requests[0].pk)) request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_requests[0].pk))
model_admin = AuditedAdmin(DomainRequest, self.site) model_admin = AuditedAdmin(DomainRequest, self.site)
@ -2343,13 +2343,13 @@ class ContactAdminTest(TestCase):
response.wsgi_request, response.wsgi_request,
"<ul class='messagelist_content-list--unstyled'>" "<ul class='messagelist_content-list--unstyled'>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request1.pk}/change/'>city1.gov</a></li>" f"domainrequest/{domain_request1.pk}/change/'>city1.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request2.pk}/change/'>city2.gov</a></li>" f"domainrequest/{domain_request2.pk}/change/'>city2.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request3.pk}/change/'>city3.gov</a></li>" f"domainrequest/{domain_request3.pk}/change/'>city3.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request4.pk}/change/'>city4.gov</a></li>" f"domainrequest/{domain_request4.pk}/change/'>city4.gov</a></li>"
"<li>Joined to User: <a href='/admin/registrar/" "<li>Joined to User: <a href='/admin/registrar/"
f"user/{self.staffuser.pk}/change/'>staff@example.com</a></li>" f"user/{self.staffuser.pk}/change/'>staff@example.com</a></li>"
"</ul>", "</ul>",
@ -2378,15 +2378,15 @@ class ContactAdminTest(TestCase):
response.wsgi_request, response.wsgi_request,
"<ul class='messagelist_content-list--unstyled'>" "<ul class='messagelist_content-list--unstyled'>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request1.pk}/change/'>city1.gov</a></li>" f"domainrequest/{domain_request1.pk}/change/'>city1.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request2.pk}/change/'>city2.gov</a></li>" f"domainrequest/{domain_request2.pk}/change/'>city2.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request3.pk}/change/'>city3.gov</a></li>" f"domainrequest/{domain_request3.pk}/change/'>city3.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request4.pk}/change/'>city4.gov</a></li>" f"domainrequest/{domain_request4.pk}/change/'>city4.gov</a></li>"
"<li>Joined to DomainRequest: <a href='/admin/registrar/" "<li>Joined to DomainRequest: <a href='/admin/registrar/"
f"DomainRequest/{domain_request5.pk}/change/'>city5.gov</a></li>" f"domainrequest/{domain_request5.pk}/change/'>city5.gov</a></li>"
"</ul>" "</ul>"
"<p class='font-sans-3xs'>And 1 more...</p>", "<p class='font-sans-3xs'>And 1 more...</p>",
) )

2
src/registrar/tests/test_migrations.py
View file

@ -34,10 +34,10 @@ class TestGroups(TestCase):
"view_logentry", "view_logentry",
"change_contact", "change_contact",
"view_domain", "view_domain",
"change_DomainRequest",
"change_domaininformation", "change_domaininformation",
"add_domaininvitation", "add_domaininvitation",
"view_domaininvitation", "view_domaininvitation",
"change_domainrequest",
"change_draftdomain", "change_draftdomain",
"analyst_access_permission", "analyst_access_permission",
"change_user", "change_user",