From 14241976fc31e36cbdfdcc4ca01aa1869380dab7 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:57:30 -0600 Subject: [PATCH] Fix remaining tests --- src/registrar/tests/test_admin_request.py | 1 + src/registrar/tests/test_api.py | 28 +++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py index 55aacd25d..d5ffa4bc7 100644 --- a/src/registrar/tests/test_admin_request.py +++ b/src/registrar/tests/test_admin_request.py @@ -1637,6 +1637,7 @@ def test_readonly_when_restricted_creator(self): "updated_at", "status", "rejection_reason", + "rejection_reason_email", "action_needed_reason", "action_needed_reason_email", "federal_agency", diff --git a/src/registrar/tests/test_api.py b/src/registrar/tests/test_api.py index d60099570..22ad2b376 100644 --- a/src/registrar/tests/test_api.py +++ b/src/registrar/tests/test_api.py @@ -144,8 +144,8 @@ def test_get_action_needed_email_for_user_json_superuser(self): ) self.assertEqual(response.status_code, 200) data = response.json() - self.assertIn("action_needed_email", data) - self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"]) + self.assertIn("email", data) + self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["email"]) @less_console_noise_decorator def test_get_action_needed_email_for_user_json_analyst(self): @@ -161,8 +161,8 @@ def test_get_action_needed_email_for_user_json_analyst(self): ) self.assertEqual(response.status_code, 200) data = response.json() - self.assertIn("action_needed_email", data) - self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"]) + self.assertIn("email", data) + self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["email"]) @less_console_noise_decorator def test_get_action_needed_email_for_user_json_regular(self): @@ -188,10 +188,10 @@ def setUp(self): self.domain_request = completed_domain_request( federal_agency=self.agency, name="test.gov", - status=DomainRequest.DomainRequestStatus.ACTION_NEEDED, + status=DomainRequest.DomainRequestStatus.REJECTED, ) - self.api_url = reverse("get-action-needed-email-for-user-json") + self.api_url = reverse("get-rejection-email-for-user-json") def tearDown(self): DomainRequest.objects.all().delete() @@ -199,21 +199,21 @@ def tearDown(self): FederalAgency.objects.all().delete() @less_console_noise_decorator - def test_get_action_needed_email_for_user_json_superuser(self): + def test_get_rejected_email_for_user_json_superuser(self): """Test that a superuser can fetch the action needed email.""" self.client.force_login(self.superuser) response = self.client.get( self.api_url, { - "reason": DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR, + "reason": DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED, "domain_request_id": self.domain_request.id, }, ) self.assertEqual(response.status_code, 200) data = response.json() - self.assertIn("action_needed_email", data) - self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"]) + self.assertIn("email", data) + self.assertIn("we could not verify the organizational", data["email"]) @less_console_noise_decorator def test_get_action_needed_email_for_user_json_analyst(self): @@ -223,14 +223,14 @@ def test_get_action_needed_email_for_user_json_analyst(self): response = self.client.get( self.api_url, { - "reason": DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL, + "reason": DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED, "domain_request_id": self.domain_request.id, }, ) self.assertEqual(response.status_code, 200) data = response.json() - self.assertIn("action_needed_email", data) - self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"]) + self.assertIn("email", data) + self.assertIn("we could not verify the organizational", data["email"]) @less_console_noise_decorator def test_get_action_needed_email_for_user_json_regular(self): @@ -240,7 +240,7 @@ def test_get_action_needed_email_for_user_json_regular(self): response = self.client.get( self.api_url, { - "reason": DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL, + "reason": DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED, "domain_request_id": self.domain_request.id, }, )