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

Additional merge conflicts

Browse source
This commit is contained in:
zandercymatics 2024-03-12 15:54:03 -06:00
parent 5661174a2d
commit 0f0ce6be53
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/models/domain_request.py
View file

@ -777,7 +777,7 @@ class DomainRequest(TimeStampedModel):
conditions=[investigator_exists_and_is_staff], conditions=[investigator_exists_and_is_staff],
) )
def approve(self, send_email=True): def approve(self, send_email=True):
"""Approve an domain_request that has been submitted. """Approve an domain request that has been submitted.
This action cleans up the rejection status if moving away from rejected. This action cleans up the rejection status if moving away from rejected.

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

@ -600,7 +600,7 @@ def completed_domain_request(
return domain_request return domain_request
def set_domain_request_investigators(domain_request_list: list[DomainRequest], investigator_user: User): def set_domain_request_investigators(domain_request_list: list[DomainRequest], investigator_user: User):
"""Helper method that sets the investigator field of all provided domain_requests""" """Helper method that sets the investigator field of all provided domain requests"""
for request in domain_request_list: for request in domain_request_list:
request.investigator = investigator_user request.investigator = investigator_user
request.save() request.save()

8
src/registrar/tests/test_models.py
View file

@ -245,11 +245,11 @@ class TestDomainRequest(TestCase):
def assert_fsm_transition_does_not_raise_error(self, test_cases, method_to_run): def assert_fsm_transition_does_not_raise_error(self, test_cases, method_to_run):
"""Given a list of test cases, ensure that none of them throw transition errors""" """Given a list of test cases, ensure that none of them throw transition errors"""
with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise(): with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
for application, exception_type in test_cases: for domain_request, exception_type in test_cases:
with self.subTest(application=application, exception_type=exception_type): with self.subTest(domain_request=domain_request, exception_type=exception_type):
try: try:
# Retrieve the method by name from the application object and call it # Retrieve the method by name from the application object and call it
method = getattr(application, method_to_run) method = getattr(domain_request, method_to_run)
# Call the method # Call the method
method() method()
except exception_type: except exception_type:
@ -920,7 +920,7 @@ class TestDomainInformation(TestCase):
self.maxDiff = None self.maxDiff = None
draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov") draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
user, _ = User.objects.get_or_create() user, _ = User.objects.get_or_create()
domain_request = DomainApplication.objects.create(creator=user, requested_domain=draft_domain, notes="test notes") domain_request = DomainRequest.objects.create(creator=user, requested_domain=draft_domain, notes="test notes")
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():