mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-22 18:56:15 +02:00
added test cases for deleted state; updated fetch_cache logic to properly handle deleted domains
This commit is contained in:
David Kennedy
parent
eda9728177
commit
8300694a3a
2 changed files with 31 additions and 69 deletions
|
|
@ -1196,7 +1196,7 @@ class Domain(TimeStampedModel, DomainHelper):
|
|||
logger.error(e)
|
||||
logger.error(e.code)
|
||||
raise e
|
||||
if e.code == ErrorCode.OBJECT_DOES_NOT_EXIST:
|
||||
if e.code == ErrorCode.OBJECT_DOES_NOT_EXIST and self.state != Domain.State.DELETED:
|
||||
# avoid infinite loop
|
||||
already_tried_to_create = True
|
||||
self.dns_needed_from_unknown()
|
||||
|
|
|
|||
|
|
@ -1083,6 +1083,7 @@ class TestWithDomainPermissions(TestWithUser):
|
|||
self.domain_just_nameserver, _ = Domain.objects.get_or_create(name="justnameserver.com")
|
||||
self.domain_no_information, _ = Domain.objects.get_or_create(name="noinformation.gov")
|
||||
self.domain_on_hold, _ = Domain.objects.get_or_create(name="on-hold.gov", state=Domain.State.ON_HOLD)
|
||||
self.domain_deleted, _ = Domain.objects.get_or_create(name="deleted.gov", state=Domain.State.DELETED)
|
||||
|
||||
self.domain_dsdata, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov")
|
||||
self.domain_multdsdata, _ = Domain.objects.get_or_create(name="dnssec-multdsdata.gov")
|
||||
|
|
@ -1098,6 +1099,7 @@ class TestWithDomainPermissions(TestWithUser):
|
|||
DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain_with_ip)
|
||||
DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain_just_nameserver)
|
||||
DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain_on_hold)
|
||||
DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain_deleted)
|
||||
|
||||
self.role, _ = UserDomainRole.objects.get_or_create(
|
||||
user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER
|
||||
|
|
@ -1129,6 +1131,9 @@ class TestWithDomainPermissions(TestWithUser):
|
|||
UserDomainRole.objects.get_or_create(
|
||||
user=self.user, domain=self.domain_on_hold, role=UserDomainRole.Roles.MANAGER
|
||||
)
|
||||
UserDomainRole.objects.get_or_create(
|
||||
user=self.user, domain=self.domain_deleted, role=UserDomainRole.Roles.MANAGER
|
||||
)
|
||||
|
||||
def tearDown(self):
|
||||
try:
|
||||
|
|
@ -1182,6 +1187,31 @@ class TestDomainPermissions(TestWithDomainPermissions):
|
|||
response = self.client.get(reverse(view_name, kwargs={"pk": self.domain.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_pages_blocked_for_on_hold_and_deleted(self):
|
||||
"""Test that the domain pages are blocked for on hold and deleted domains"""
|
||||
|
||||
self.client.force_login(self.user)
|
||||
for view_name in [
|
||||
"domain-users",
|
||||
"domain-users-add",
|
||||
"domain-dns",
|
||||
"domain-dns-nameservers",
|
||||
"domain-dns-dnssec",
|
||||
"domain-dns-dnssec-dsdata",
|
||||
"domain-org-name-address",
|
||||
"domain-authorizing-official",
|
||||
"domain-your-contact-information",
|
||||
"domain-security-email",
|
||||
]:
|
||||
for domain in [
|
||||
self.domain_on_hold,
|
||||
self.domain_deleted,
|
||||
]:
|
||||
with self.subTest(view_name=view_name, domain=domain):
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse(view_name, kwargs={"pk": domain.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
|
||||
class TestDomainOverview(TestWithDomainPermissions, WebTest):
|
||||
def setUp(self):
|
||||
|
|
@ -1272,19 +1302,6 @@ class TestDomainManagers(TestDomainOverview):
|
|||
response = self.client.get(reverse("domain-users", kwargs={"pk": self.domain.id}))
|
||||
self.assertContains(response, "Domain managers")
|
||||
|
||||
def test_domain_users_blocked_for_on_hold(self):
|
||||
"""Test that the domain users page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain users page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-users", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
# attempt to view domain users add page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-users-add", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_managers_add_link(self):
|
||||
"""Button to get to user add page works."""
|
||||
management_page = self.app.get(reverse("domain-users", kwargs={"pk": self.domain.id}))
|
||||
|
|
@ -1418,14 +1435,6 @@ class TestDomainNameservers(TestDomainOverview):
|
|||
page = self.client.get(reverse("domain-dns-nameservers", kwargs={"pk": self.domain.id}))
|
||||
self.assertContains(page, "DNS name servers")
|
||||
|
||||
def test_domain_nameservers_blocked_for_on_hold(self):
|
||||
"""Test that the domain nameservers page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain nameservers page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-dns-nameservers", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_nameservers_form_submit_one_nameserver(self):
|
||||
"""Nameserver form submitted with one nameserver throws error.
|
||||
|
||||
|
|
@ -1641,14 +1650,6 @@ class TestDomainAuthorizingOfficial(TestDomainOverview):
|
|||
# once on the sidebar, once in the title
|
||||
self.assertContains(page, "Authorizing official", count=2)
|
||||
|
||||
def test_domain_authorizing_official_blocked_for_on_hold(self):
|
||||
"""Test that the domain authorizing official page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain authorizing official page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-authorizing-official", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_authorizing_official_content(self):
|
||||
"""Authorizing official information appears on the page."""
|
||||
self.domain_information.authorizing_official = Contact(first_name="Testy")
|
||||
|
|
@ -1665,14 +1666,6 @@ class TestDomainOrganization(TestDomainOverview):
|
|||
# once on the sidebar, once in the page title, once as H1
|
||||
self.assertContains(page, "Organization name and mailing address", count=3)
|
||||
|
||||
def test_domain_org_name_blocked_for_on_hold(self):
|
||||
"""Test that the domain org name page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain org name page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_org_name_address_content(self):
|
||||
"""Org name and address information appears on the page."""
|
||||
self.domain_information.organization_name = "Town of Igorville"
|
||||
|
|
@ -1704,16 +1697,6 @@ class TestDomainContactInformation(TestDomainOverview):
|
|||
page = self.client.get(reverse("domain-your-contact-information", kwargs={"pk": self.domain.id}))
|
||||
self.assertContains(page, "Your contact information")
|
||||
|
||||
def test_domain_contact_information_blocked_for_on_hold(self):
|
||||
"""Test that the domain contact information page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain contact information page
|
||||
with less_console_noise():
|
||||
response = self.client.get(
|
||||
reverse("domain-your-contact-information", kwargs={"pk": self.domain_on_hold.id})
|
||||
)
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_your_contact_information_content(self):
|
||||
"""Logged-in user's contact information appears on the page."""
|
||||
self.user.contact.first_name = "Testy"
|
||||
|
|
@ -1739,14 +1722,6 @@ class TestDomainSecurityEmail(TestDomainOverview):
|
|||
self.assertContains(page, "security@mail.gov")
|
||||
self.mockSendPatch.stop()
|
||||
|
||||
def test_domain_security_email_blocked_for_on_hold(self):
|
||||
"""Test that the domain security email page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain security email page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-security-email", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_domain_security_email_no_security_contact(self):
|
||||
"""Loads a domain with no defined security email.
|
||||
We should not show the default."""
|
||||
|
|
@ -1874,19 +1849,6 @@ class TestDomainDNSSEC(TestDomainOverview):
|
|||
page = self.client.get(reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}))
|
||||
self.assertContains(page, "Enable DNSSEC")
|
||||
|
||||
def test_domain_dnssec_blocked_for_on_hold(self):
|
||||
"""Test that the domain dnssec page blocked for on hold domain"""
|
||||
|
||||
# attempt to view domain dnssec page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-dns-dnssec", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
# attempt to view domain dnssec dsdata page
|
||||
with less_console_noise():
|
||||
response = self.client.get(reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_on_hold.id}))
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_dnssec_page_loads_with_data_in_domain(self):
|
||||
"""DNSSEC overview page loads when domain has DNSSEC data
|
||||
and the template contains a button to disable DNSSEC."""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue