diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 217e24b9a..a9afedb22 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -157,30 +157,15 @@ class HomeTests(TestWithUser): self.assertContains(response, "You don't have any registered domains.") self.assertContains(response, "Why don't I see my domain when I sign in to the registrar?") - def test_home_lists_domain_requests(self): - response = self.client.get("/") - self.assertNotContains(response, "igorville.gov") - site = DraftDomain.objects.create(name="igorville.gov") - domain_request = DomainRequest.objects.create(creator=self.user, requested_domain=site) - response = self.client.get("/") - - # count = 7 because of screenreader content - self.assertContains(response, "igorville.gov", count=7) - - # clean up - domain_request.delete() - def test_state_help_text(self): """Tests if each domain state has help text""" # Get the expected text content of each state deleted_text = "This domain has been removed and " "is no longer registered to your organization." - dns_needed_text = "Before this domain can be used, " "you’ll need to add name server addresses." + dns_needed_text = "Before this domain can be used, " ready_text = "This domain has name servers and is ready for use." on_hold_text = ( "This domain is administratively paused, " - "so it can’t be edited and won’t resolve in DNS. " - "Contact help@get.gov for details." ) deleted_text = "This domain has been removed and " "is no longer registered to your organization." # Generate a mapping of domain names, the state, and expected messages for the subtest @@ -202,12 +187,12 @@ class HomeTests(TestWithUser): user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER ) - # Grab the home page - response = self.client.get("/") + # Grab the response + response = self.client.get("/get-domains-json/") # Make sure the user can actually see the domain. # We expect two instances because of SR content. - self.assertContains(response, domain_name, count=2) + self.assertContains(response, domain_name, count=1) # Check that we have the right text content. self.assertContains(response, expected_message, count=1) @@ -218,19 +203,19 @@ class HomeTests(TestWithUser): def test_state_help_text_expired(self): """Tests if each domain state has help text when expired""" - expired_text = "This domain has expired, but it is still online. " "To renew this domain, contact help@get.gov." + expired_text = "This domain has expired, but it is still online. " test_domain, _ = Domain.objects.get_or_create(name="expired.gov", state=Domain.State.READY) test_domain.expiration_date = date(2011, 10, 10) test_domain.save() UserDomainRole.objects.get_or_create(user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER) - # Grab the home page - response = self.client.get("/") + # Grab the response + response = self.client.get("/get-domains-json/") # Make sure the user can actually see the domain. # We expect two instances because of SR content. - self.assertContains(response, "expired.gov", count=2) + self.assertContains(response, "expired.gov", count=1) # Check that we have the right text content. self.assertContains(response, expired_text, count=1) @@ -239,19 +224,17 @@ class HomeTests(TestWithUser): """Tests if each domain state has help text when expiration date is None""" # == Test a expiration of None for state ready. This should be expired. == # - expired_text = "This domain has expired, but it is still online. " "To renew this domain, contact help@get.gov." + expired_text = "This domain has expired, but it is still online. " test_domain, _ = Domain.objects.get_or_create(name="imexpired.gov", state=Domain.State.READY) test_domain.expiration_date = None test_domain.save() UserDomainRole.objects.get_or_create(user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER) - # Grab the home page - response = self.client.get("/") + # Grab the response + response = self.client.get("/get-domains-json/") - # Make sure the user can actually see the domain. - # We expect two instances because of SR content. - self.assertContains(response, "imexpired.gov", count=2) + self.assertContains(response, "imexpired.gov", count=1) # Make sure the expiration date is None self.assertEqual(test_domain.expiration_date, None) @@ -260,19 +243,17 @@ class HomeTests(TestWithUser): self.assertContains(response, expired_text, count=1) # == Test a expiration of None for state unknown. This should not display expired text. == # - unknown_text = "Before this domain can be used, " "you’ll need to add name server addresses." + unknown_text = "Before this domain can be used, " test_domain_2, _ = Domain.objects.get_or_create(name="notexpired.gov", state=Domain.State.UNKNOWN) test_domain_2.expiration_date = None test_domain_2.save() UserDomainRole.objects.get_or_create(user=self.user, domain=test_domain_2, role=UserDomainRole.Roles.MANAGER) - # Grab the home page - response = self.client.get("/") + # Grab the response + response = self.client.get("/get-domains-json/") - # Make sure the user can actually see the domain. - # We expect two instances because of SR content. - self.assertContains(response, "notexpired.gov", count=2) + self.assertContains(response, "notexpired.gov", count=1) # Make sure the expiration date is None self.assertEqual(test_domain_2.expiration_date, None) @@ -288,14 +269,6 @@ class HomeTests(TestWithUser): creator=self.user, requested_domain=site, status=DomainRequest.DomainRequestStatus.WITHDRAWN ) - # Ensure that igorville.gov exists on the page - home_page = self.client.get("/") - self.assertContains(home_page, "igorville.gov") - - # Check if the delete button exists. We can do this by checking for its id and text content. - self.assertContains(home_page, "Delete") - self.assertContains(home_page, "button-toggle-delete-domain-alert-1") - # Trigger the delete logic response = self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}), follow=True) @@ -312,14 +285,6 @@ class HomeTests(TestWithUser): creator=self.user, requested_domain=site, status=DomainRequest.DomainRequestStatus.STARTED ) - # Ensure that igorville.gov exists on the page - home_page = self.client.get("/") - self.assertContains(home_page, "igorville.gov") - - # Check if the delete button exists. We can do this by checking for its id and text content. - self.assertContains(home_page, "Delete") - self.assertContains(home_page, "button-toggle-delete-domain-alert-1") - # Trigger the delete logic response = self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}), follow=True) diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index 1d9fbb2a8..d042ee371 100644 --- a/src/registrar/tests/test_views_domain.py +++ b/src/registrar/tests/test_views_domain.py @@ -222,27 +222,6 @@ class TestDomainDetail(TestDomainOverview): self.assertContains(detail_page, "igorville.gov") self.assertContains(detail_page, "Status") - def test_unknown_domain_does_not_show_as_expired_on_homepage(self): - """An UNKNOWN domain does not show as expired on the homepage. - It shows as 'DNS needed'""" - # At the time of this test's writing, there are 6 UNKNOWN domains inherited - # from constructors. Let's reset. - with less_console_noise(): - Domain.objects.all().delete() - UserDomainRole.objects.all().delete() - self.domain, _ = Domain.objects.get_or_create(name="igorville.gov") - home_page = self.app.get("/") - self.assertNotContains(home_page, "igorville.gov") - self.role, _ = UserDomainRole.objects.get_or_create( - user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER - ) - home_page = self.app.get("/") - self.assertContains(home_page, "igorville.gov") - igorville = Domain.objects.get(name="igorville.gov") - self.assertEquals(igorville.state, Domain.State.UNKNOWN) - self.assertNotContains(home_page, "Expired") - self.assertContains(home_page, "DNS needed") - def test_unknown_domain_does_not_show_as_expired_on_detail_page(self): """An UNKNOWN domain should not exist on the detail_page anymore. It shows as 'DNS needed'""" @@ -258,11 +237,9 @@ class TestDomainDetail(TestDomainOverview): user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER ) - home_page = self.app.get("/") - self.assertContains(home_page, "igorville.gov") igorville = Domain.objects.get(name="igorville.gov") self.assertEquals(igorville.state, Domain.State.UNKNOWN) - detail_page = home_page.click("Manage", index=0) + detail_page = self.app.get(f'/domain/{igorville.id}') self.assertContains(detail_page, "Expired") self.assertNotContains(detail_page, "DNS needed") @@ -274,26 +251,18 @@ class TestDomainDetail(TestDomainOverview): with less_console_noise(): self.user.status = User.RESTRICTED self.user.save() - home_page = self.app.get("/") - self.assertContains(home_page, "igorville.gov") response = self.client.get(reverse("domain", kwargs={"pk": self.domain.id})) self.assertEqual(response.status_code, 403) def test_domain_detail_allowed_for_on_hold(self): """Test that the domain overview page displays for on hold domain""" with less_console_noise(): - home_page = self.app.get("/") - self.assertContains(home_page, "on-hold.gov") - # View domain overview page detail_page = self.client.get(reverse("domain", kwargs={"pk": self.domain_on_hold.id})) self.assertNotContains(detail_page, "Edit") def test_domain_detail_see_just_nameserver(self): with less_console_noise(): - home_page = self.app.get("/") - self.assertContains(home_page, "justnameserver.com") - # View nameserver on Domain Overview page detail_page = self.app.get(reverse("domain", kwargs={"pk": self.domain_just_nameserver.id})) @@ -303,9 +272,6 @@ class TestDomainDetail(TestDomainOverview): def test_domain_detail_see_nameserver_and_ip(self): with less_console_noise(): - home_page = self.app.get("/") - self.assertContains(home_page, "nameserverwithip.gov") - # View nameserver on Domain Overview page detail_page = self.app.get(reverse("domain", kwargs={"pk": self.domain_with_ip.id})) @@ -1644,8 +1610,6 @@ class TestDomainSecurityEmail(TestDomainOverview): management pages share the same permissions class""" self.user.status = User.RESTRICTED self.user.save() - home_page = self.app.get("/") - self.assertContains(home_page, "igorville.gov") with less_console_noise(): response = self.client.get(reverse("domain", kwargs={"pk": self.domain.id})) self.assertEqual(response.status_code, 403) diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py index 2b577b41a..87fee4b61 100644 --- a/src/registrar/tests/test_views_request.py +++ b/src/registrar/tests/test_views_request.py @@ -47,11 +47,8 @@ class DomainRequestTests(TestWithUser, WebTest): def test_domain_request_form_intro_is_skipped_when_edit_access(self): """Tests that user is NOT presented with intro acknowledgement page when accessed through 'edit'""" - completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user) - home_page = self.app.get("/") - self.assertContains(home_page, "city.gov") - # click the "Edit" link - detail_page = home_page.click("Edit", index=0) + domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user) + detail_page = self.app.get(f'/domain-request/{domain_request.id}/edit/') # Check that the response is a redirect self.assertEqual(detail_page.status_code, 302) # You can access the 'Location' header to get the redirect URL @@ -2402,10 +2399,7 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest): domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.SUBMITTED, user=self.user) domain_request.save() - home_page = self.app.get("/") - self.assertContains(home_page, "city.gov") - # click the "Manage" link - detail_page = home_page.click("Manage", index=0) + detail_page = self.app.get(f'/domain-request/{domain_request.id}') self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester") @@ -2422,10 +2416,7 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest): domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.SUBMITTED, user=self.user) domain_request.save() - home_page = self.app.get("/") - self.assertContains(home_page, "city.gov") - # click the "Manage" link - detail_page = home_page.click("Manage", index=0) + detail_page = self.app.get(f'/domain-request/{domain_request.id}') self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "Chief Tester") self.assertContains(detail_page, "testy@town.com") @@ -2437,10 +2428,7 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest): domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.SUBMITTED, user=self.user) domain_request.save() - home_page = self.app.get("/") - self.assertContains(home_page, "city.gov") - # click the "Manage" link - detail_page = home_page.click("Manage", index=0) + detail_page = self.app.get(f'/domain-request/{domain_request.id}') self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester") @@ -2462,8 +2450,8 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest): target_status_code=200, fetch_redirect_response=True, ) - home_page = self.app.get("/") - self.assertContains(home_page, "Withdrawn") + response = self.client.get('/get-domain-requests-json/') + self.assertContains(response, "Withdrawn") def test_domain_request_withdraw_no_permissions(self): """Can't withdraw domain requests as a restricted user.""" @@ -2472,10 +2460,7 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest): domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.SUBMITTED, user=self.user) domain_request.save() - home_page = self.app.get("/") - self.assertContains(home_page, "city.gov") - # click the "Manage" link - detail_page = home_page.click("Manage", index=0) + detail_page = self.app.get(f'/domain-request/{domain_request.id}') self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester") @@ -2545,23 +2530,16 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest): def test_unlocked_steps_full_domain_request(self): """Test when all fields in the domain request are filled.""" - completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user) - # Make a request to the home page - home_page = self.app.get("/") - # django-webtest does not handle cookie-based sessions well because it keeps + domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user) + + response = self.app.get(f'/domain-request/{domain_request.id}/edit/') + # django-webtest does not handle cookie-based sessions well because it keeps # resetting the session key on each new request, thus destroying the concept # of a "session". We are going to do it manually, saving the session ID here # and then setting the cookie on each request. session_id = self.app.cookies[settings.SESSION_COOKIE_NAME] self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - # Assert that the response contains "city.gov" - self.assertContains(home_page, "city.gov") - - # Click the "Edit" link - response = home_page.click("Edit", index=0) - self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - # Check if the response is a redirect if response.status_code == 302: # Follow the redirect manually @@ -2612,8 +2590,7 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest): ) domain_request.other_contacts.set([contact_2]) - # Make a request to the home page - home_page = self.app.get("/") + response = self.app.get(f'/domain-request/{domain_request.id}/edit/') # django-webtest does not handle cookie-based sessions well because it keeps # resetting the session key on each new request, thus destroying the concept # of a "session". We are going to do it manually, saving the session ID here @@ -2621,13 +2598,6 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest): session_id = self.app.cookies[settings.SESSION_COOKIE_NAME] self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - # Assert that the response contains "city.gov" - self.assertContains(home_page, "igorville.gov") - - # Click the "Edit" link - response = home_page.click("Edit", index=0) - self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - # Check if the response is a redirect if response.status_code == 302: # Follow the redirect manually