zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-30 06:26:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

unit tests

Browse source
This commit is contained in:
Rachid Mrad 2024-10-02 18:12:40 -04:00
parent 4df509c4f7
commit 0ea37d7113
No known key found for this signature in database
2 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/registrar/admin.py
View file

@ -2013,8 +2013,17 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
should_proceed = False should_proceed = False
return (obj, should_proceed) return (obj, should_proceed)
request_is_not_approved = original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED obj_is_not_approved = obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
if request_is_not_approved and Domain.objects.filter(name=original_obj.requested_domain.name).exists(): original_obj_is_not_approved = original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
if obj_is_not_approved and not obj.domain_is_not_active():
# If an admin tried to set an approved domain request to
# another status and the related domain is already
# active (READY), shortcut the action and throw a friendly
# error message. This action would still not go through
# shortcut or not as the rules are duplicated on the model,
# but the error would be an ugly Django error screen.
error_message = "This action is not permitted. The domain is already active."
if original_obj_is_not_approved and Domain.objects.filter(name=original_obj.requested_domain.name).exists():
# REDUNDANT CHECK: # REDUNDANT CHECK:
# This action (approving a request when the domain is active) # This action (approving a request when the domain is active)
# would still not go through check or not as the rules are # would still not go through check or not as the rules are

35
src/registrar/tests/test_admin_request.py
View file

@ -25,7 +25,6 @@ from registrar.models import (
Portfolio, Portfolio,
AllowedEmail, AllowedEmail,
) )
from registrar.utility.errors import FSMErrorCodes
from .common import ( from .common import (
MockSESClient, MockSESClient,
completed_domain_request, completed_domain_request,
@ -38,7 +37,6 @@ from .common import (
GenericTestHelper, GenericTestHelper,
) )
from unittest.mock import patch from unittest.mock import patch
from django_fsm import TransitionNotAllowed
from django.conf import settings from django.conf import settings
import boto3_mocking # type: ignore import boto3_mocking # type: ignore
@ -1798,10 +1796,18 @@ class TestDomainRequestAdmin(MockEppLib):
domain_request.rejection_reason = rejection_reason domain_request.rejection_reason = rejection_reason
if domain_is_active:
with self.assertRaises(TransitionNotAllowed):
self.admin.save_model(request, domain_request, None, True) self.admin.save_model(request, domain_request, None, True)
# Assert that the error message was called with the correct argument
if domain_is_active:
messages.error.assert_called_once_with(
request,
"This action is not permitted. The domain " + "is already active.",
)
else: else:
# Assert that the error message was never called
messages.error.assert_not_called()
self.assertEqual(domain_request.approved_domain, None) self.assertEqual(domain_request.approved_domain, None)
# Assert that Domain got Deleted # Assert that Domain got Deleted
@ -1812,27 +1818,6 @@ class TestDomainRequestAdmin(MockEppLib):
with self.assertRaises(DomainInformation.DoesNotExist): with self.assertRaises(DomainInformation.DoesNotExist):
domain_information.refresh_from_db() domain_information.refresh_from_db()
# # Assert that the error message was called with the correct argument
# if domain_is_active:
# messages.error.assert_called_once_with(
# request,
# FSMErrorCodes.APPROVE_DOMAIN_IN_USE,
# )
# else:
# # Assert that the error message was never called
# messages.error.assert_not_called()
# self.assertEqual(domain_request.approved_domain, None)
# # Assert that Domain got Deleted
# with self.assertRaises(Domain.DoesNotExist):
# domain.refresh_from_db()
# # Assert that DomainInformation got Deleted
# with self.assertRaises(DomainInformation.DoesNotExist):
# domain_information.refresh_from_db()
def test_error_when_saving_approved_to_in_review_and_domain_is_active(self): def test_error_when_saving_approved_to_in_review_and_domain_is_active(self):
self.trigger_saving_approved_to_another_state(True, DomainRequest.DomainRequestStatus.IN_REVIEW) self.trigger_saving_approved_to_another_state(True, DomainRequest.DomainRequestStatus.IN_REVIEW)