mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-29 04:23:19 +02:00
Merge remote-tracking branch 'origin/main' into cb/3212-subissues
This commit is contained in:
commit
4d35b719d2
38 changed files with 1327 additions and 627 deletions
|
@ -50,6 +50,7 @@ from unittest.mock import ANY, patch
|
|||
from django.conf import settings
|
||||
import boto3_mocking # type: ignore
|
||||
import logging
|
||||
from django.contrib.messages.storage.fallback import FallbackStorage
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -2314,7 +2315,6 @@ class TestDomainRequestAdmin(MockEppLib):
|
|||
|
||||
Used to test errors when saving a change with an active domain, also used to test side effects
|
||||
when saving a change goes through."""
|
||||
|
||||
with less_console_noise():
|
||||
# Create an instance of the model
|
||||
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
|
||||
|
@ -2427,6 +2427,44 @@ class TestDomainRequestAdmin(MockEppLib):
|
|||
"Cannot approve. Requested domain is already in use.",
|
||||
)
|
||||
|
||||
def test_error_when_approving_domain_in_pending_delete_state(self):
|
||||
"""If in pendingDelete state from in review -> approve not allowed."""
|
||||
|
||||
# 1. Create domain
|
||||
to_be_in_pending_deleted = completed_domain_request(
|
||||
status=DomainRequest.DomainRequestStatus.SUBMITTED, name="meoward1.gov"
|
||||
)
|
||||
to_be_in_pending_deleted.creator = self.superuser
|
||||
|
||||
# 2. Put domain into in-review state
|
||||
to_be_in_pending_deleted.status = DomainRequest.DomainRequestStatus.IN_REVIEW
|
||||
to_be_in_pending_deleted.save()
|
||||
|
||||
# 3. Update request as a superuser
|
||||
request = self.factory.post(f"/admin/registrar/domainrequest/{to_be_in_pending_deleted.pk}/change/")
|
||||
request.user = self.superuser
|
||||
request.session = {}
|
||||
|
||||
setattr(request, "_messages", FallbackStorage(request))
|
||||
|
||||
# 4. Use ExitStack for combine patching like above
|
||||
with boto3_mocking.clients.handler_for("sesv2", self.mock_client), ExitStack() as stack:
|
||||
# Patch django.contrib.messages.error
|
||||
stack.enter_context(patch.object(messages, "error"))
|
||||
|
||||
with patch("registrar.models.domain.Domain.is_pending_delete", return_value=True):
|
||||
# Attempt to approve to_be_in_pending_deleted
|
||||
# (which should fail due is_pending_delete == True so nothing can get approved)
|
||||
to_be_in_pending_deleted.status = DomainRequest.DomainRequestStatus.APPROVED
|
||||
|
||||
# Save the model with the patched request
|
||||
self.admin.save_model(request, to_be_in_pending_deleted, None, True)
|
||||
|
||||
messages.error.assert_called_once_with(
|
||||
request,
|
||||
"Domain of same name is currently in pending delete state.",
|
||||
)
|
||||
|
||||
@less_console_noise
|
||||
def test_no_error_when_saving_to_approved_and_domain_exists(self):
|
||||
"""The negative of the redundant admin check on model transition not allowed."""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue