diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index 7c0d801ad..a2f328e1f 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -21,6 +21,9 @@
{% else %}
{% endif %}
+ {% if sub_header_text %}
+
+ {% endif %}
{% if address %}
{% include "includes/organization_address.html" with organization=value %}
{% elif contact %}
@@ -39,6 +42,10 @@
{% endfor %}
+ {% elif custom_text_for_value_none %}
+
+ {{ custom_text_for_value_none }}
+
{% else %}
None
@@ -92,6 +99,8 @@
{% if value %}
{{ value }}
+ {% elif custom_text_for_value_none %}
+ {{ custom_text_for_value_none }}
{% else %}
None
{% endif %}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index cff4455fb..eeda99efb 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1994,6 +1994,9 @@ class TestDomainRequestAdmin(MockEppLib):
"purpose",
"no_other_contacts_rationale",
"anything_else",
+ "has_anything_else_text",
+ "cisa_representative_email",
+ "has_cisa_representative",
"is_policy_acknowledged",
"submission_date",
"notes",
@@ -2025,6 +2028,7 @@ class TestDomainRequestAdmin(MockEppLib):
"no_other_contacts_rationale",
"anything_else",
"is_policy_acknowledged",
+ "cisa_representative_email",
]
self.assertEqual(readonly_fields, expected_fields)
diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index 4b8904f0c..c72c70e98 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -15,7 +15,7 @@ from registrar.forms.domain_request_wizard import (
RequirementsForm,
TribalGovernmentForm,
PurposeForm,
- AnythingElseForm,
+ AdditionalDetailsForm,
AboutYourOrganizationForm,
)
from registrar.forms.domain import ContactForm
@@ -274,7 +274,7 @@ class TestFormValidation(MockEppLib):
def test_anything_else_form_about_your_organization_character_count_invalid(self):
"""Response must be less than 2000 characters."""
- form = AnythingElseForm(
+ form = AdditionalDetailsForm(
data={
"anything_else": "Bacon ipsum dolor amet fatback strip steak pastrami"
"shankle, drumstick doner chicken landjaeger turkey andouille."
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index a4cb210bc..19be5ce74 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -356,33 +356,39 @@ class DomainRequestTests(TestWithUser, WebTest):
# the post request should return a redirect to the next form in
# the domain request page
self.assertEqual(other_contacts_result.status_code, 302)
- self.assertEqual(other_contacts_result["Location"], "/request/anything_else/")
+ self.assertEqual(other_contacts_result["Location"], "/request/additional_details/")
num_pages_tested += 1
- # ---- ANYTHING ELSE PAGE ----
+ # ---- ADDITIONAL DETAILS PAGE ----
# Follow the redirect to the next form page
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
- anything_else_page = other_contacts_result.follow()
- anything_else_form = anything_else_page.forms[0]
+ additional_details_page = other_contacts_result.follow()
+ additional_details_form = additional_details_page.forms[0]
- anything_else_form["anything_else-anything_else"] = "Nothing else."
+ # load inputs with test data
+
+ additional_details_form["additional_details-has_cisa_representative"] = "True"
+ additional_details_form["additional_details-has_anything_else_text"] = "True"
+ additional_details_form["additional_details-cisa_representative_email"] = "FakeEmail@gmail.com"
+ additional_details_form["additional_details-anything_else"] = "Nothing else."
# test next button
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
- anything_else_result = anything_else_form.submit()
+ additional_details_result = additional_details_form.submit()
# validate that data from this step are being saved
domain_request = DomainRequest.objects.get() # there's only one
+ self.assertEqual(domain_request.cisa_representative_email, "FakeEmail@gmail.com")
self.assertEqual(domain_request.anything_else, "Nothing else.")
# the post request should return a redirect to the next form in
# the domain request page
- self.assertEqual(anything_else_result.status_code, 302)
- self.assertEqual(anything_else_result["Location"], "/request/requirements/")
+ self.assertEqual(additional_details_result.status_code, 302)
+ self.assertEqual(additional_details_result["Location"], "/request/requirements/")
num_pages_tested += 1
# ---- REQUIREMENTS PAGE ----
# Follow the redirect to the next form page
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
- requirements_page = anything_else_result.follow()
+ requirements_page = additional_details_result.follow()
requirements_form = requirements_page.forms[0]
requirements_form["requirements-is_policy_acknowledged"] = True
@@ -434,6 +440,7 @@ class DomainRequestTests(TestWithUser, WebTest):
self.assertContains(review_page, "Another Tester")
self.assertContains(review_page, "testy2@town.com")
self.assertContains(review_page, "(201) 555-5557")
+ self.assertContains(review_page, "FakeEmail@gmail.com")
self.assertContains(review_page, "Nothing else.")
# We can't test the modal itself as it relies on JS for init and triggering,
@@ -717,13 +724,25 @@ class DomainRequestTests(TestWithUser, WebTest):
self.assertContains(contact_page, self.TITLES[Step.ABOUT_YOUR_ORGANIZATION])
- def test_yes_no_form_inits_blank_for_new_domain_request(self):
+ def test_yes_no_contact_form_inits_blank_for_new_domain_request(self):
"""On the Other Contacts page, the yes/no form gets initialized with nothing selected for
new domain requests"""
other_contacts_page = self.app.get(reverse("domain-request:other_contacts"))
other_contacts_form = other_contacts_page.forms[0]
self.assertEquals(other_contacts_form["other_contacts-has_other_contacts"].value, None)
+ def test_yes_no_additional_form_inits_blank_for_new_domain_request(self):
+ """On the Additional Details page, the yes/no form gets initialized with nothing selected for
+ new domain requests"""
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ additional_form = additional_details_page.forms[0]
+
+ # Check the cisa representative yes/no field
+ self.assertEquals(additional_form["additional_details-has_cisa_representative"].value, None)
+
+ # Check the anything else yes/no field
+ self.assertEquals(additional_form["additional_details-has_anything_else_text"].value, None)
+
def test_yes_no_form_inits_yes_for_domain_request_with_other_contacts(self):
"""On the Other Contacts page, the yes/no form gets initialized with YES selected if the
domain request has other contacts"""
@@ -744,6 +763,38 @@ class DomainRequestTests(TestWithUser, WebTest):
other_contacts_form = other_contacts_page.forms[0]
self.assertEquals(other_contacts_form["other_contacts-has_other_contacts"].value, "True")
+ def test_yes_no_form_inits_yes_for_cisa_representative_and_anything_else(self):
+ """On the Additional Details page, the yes/no form gets initialized with YES selected
+ for both yes/no radios if the domain request has a value for cisa_representative and
+ anything_else"""
+
+ domain_request = completed_domain_request(user=self.user, has_anything_else=True)
+ domain_request.cisa_representative_email = "test@igorville.gov"
+ domain_request.anything_else = "1234"
+ domain_request.save()
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Check the cisa representative yes/no field
+ yes_no_cisa = additional_details_form["additional_details-has_cisa_representative"].value
+ self.assertEquals(yes_no_cisa, "True")
+
+ # Check the anything else yes/no field
+ yes_no_anything_else = additional_details_form["additional_details-has_anything_else_text"].value
+ self.assertEquals(yes_no_anything_else, "True")
+
def test_yes_no_form_inits_no_for_domain_request_with_no_other_contacts_rationale(self):
"""On the Other Contacts page, the yes/no form gets initialized with NO selected if the
domain request has no other contacts"""
@@ -766,6 +817,230 @@ class DomainRequestTests(TestWithUser, WebTest):
other_contacts_form = other_contacts_page.forms[0]
self.assertEquals(other_contacts_form["other_contacts-has_other_contacts"].value, "False")
+ def test_yes_no_form_for_domain_request_with_no_cisa_representative_and_anything_else(self):
+ """On the Additional details page, the form preselects "no" when has_cisa_representative
+ and anything_else is no"""
+
+ domain_request = completed_domain_request(user=self.user, has_anything_else=False)
+
+ # Unlike the other contacts form, the no button is tracked with these boolean fields.
+ # This means that we should expect this to correlate with the no button.
+ domain_request.has_anything_else_text = False
+ domain_request.has_cisa_representative = False
+ domain_request.save()
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Check the cisa representative yes/no field
+ yes_no_cisa = additional_details_form["additional_details-has_cisa_representative"].value
+ self.assertEquals(yes_no_cisa, "False")
+
+ # Check the anything else yes/no field
+ yes_no_anything_else = additional_details_form["additional_details-has_anything_else_text"].value
+ self.assertEquals(yes_no_anything_else, "False")
+
+ def test_submitting_additional_details_deletes_cisa_representative_and_anything_else(self):
+ """When a user submits the Additional Details form with no selected for all fields,
+ the domain request's data gets wiped when submitted"""
+ domain_request = completed_domain_request(name="nocisareps.gov", user=self.user)
+ domain_request.cisa_representative_email = "fake@faketown.gov"
+ domain_request.save()
+
+ # Make sure we have the data we need for the test
+ self.assertEqual(domain_request.anything_else, "There is more")
+ self.assertEqual(domain_request.cisa_representative_email, "fake@faketown.gov")
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Check the cisa representative yes/no field
+ yes_no_cisa = additional_details_form["additional_details-has_cisa_representative"].value
+ self.assertEquals(yes_no_cisa, "True")
+
+ # Check the anything else yes/no field
+ yes_no_anything_else = additional_details_form["additional_details-has_anything_else_text"].value
+ self.assertEquals(yes_no_anything_else, "True")
+
+ # Set fields to false
+ additional_details_form["additional_details-has_cisa_representative"] = "False"
+ additional_details_form["additional_details-has_anything_else_text"] = "False"
+
+ # Submit the form
+ additional_details_form.submit()
+
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ # Verify that the anything_else and cisa_representative have been deleted from the DB
+ domain_request = DomainRequest.objects.get(requested_domain__name="nocisareps.gov")
+
+ # Check that our data has been cleared
+ self.assertEqual(domain_request.anything_else, None)
+ self.assertEqual(domain_request.cisa_representative_email, None)
+
+ # Double check the yes/no fields
+ self.assertEqual(domain_request.has_anything_else_text, False)
+ self.assertEqual(domain_request.has_cisa_representative, False)
+
+ def test_submitting_additional_details_populates_cisa_representative_and_anything_else(self):
+ """When a user submits the Additional Details form,
+ the domain request's data gets submitted"""
+ domain_request = completed_domain_request(name="cisareps.gov", user=self.user, has_anything_else=False)
+
+ # Make sure we have the data we need for the test
+ self.assertEqual(domain_request.anything_else, None)
+ self.assertEqual(domain_request.cisa_representative_email, None)
+
+ # These fields should not be selected at all, since we haven't initialized the form yet
+ self.assertEqual(domain_request.has_anything_else_text, None)
+ self.assertEqual(domain_request.has_cisa_representative, None)
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Set fields to true, and set data on those fields
+ additional_details_form["additional_details-has_cisa_representative"] = "True"
+ additional_details_form["additional_details-has_anything_else_text"] = "True"
+ additional_details_form["additional_details-cisa_representative_email"] = "test@faketest.gov"
+ additional_details_form["additional_details-anything_else"] = "redandblue"
+
+ # Submit the form
+ additional_details_form.submit()
+
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ # Verify that the anything_else and cisa_representative exist in the db
+ domain_request = DomainRequest.objects.get(requested_domain__name="cisareps.gov")
+
+ self.assertEqual(domain_request.anything_else, "redandblue")
+ self.assertEqual(domain_request.cisa_representative_email, "test@faketest.gov")
+
+ self.assertEqual(domain_request.has_cisa_representative, True)
+ self.assertEqual(domain_request.has_anything_else_text, True)
+
+ def test_if_cisa_representative_yes_no_form_is_yes_then_field_is_required(self):
+ """Applicants with a cisa representative must provide a value"""
+ domain_request = completed_domain_request(name="cisareps.gov", user=self.user, has_anything_else=False)
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Set fields to true, and set data on those fields
+ additional_details_form["additional_details-has_cisa_representative"] = "True"
+ additional_details_form["additional_details-has_anything_else_text"] = "False"
+
+ # Submit the form
+ response = additional_details_form.submit()
+
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ self.assertContains(response, "Enter the email address of your CISA regional representative.")
+
+ def test_if_anything_else_yes_no_form_is_yes_then_field_is_required(self):
+ """Applicants with a anything else must provide a value"""
+ domain_request = completed_domain_request(name="cisareps.gov", user=self.user, has_anything_else=False)
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Set fields to true, and set data on those fields
+ additional_details_form["additional_details-has_cisa_representative"] = "False"
+ additional_details_form["additional_details-has_anything_else_text"] = "True"
+
+ # Submit the form
+ response = additional_details_form.submit()
+
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ expected_message = "Provide additional details you’d like us to know. If you have nothing to add, select “No.”"
+ self.assertContains(response, expected_message)
+
+ def test_additional_details_form_fields_required(self):
+ """When a user submits the Additional Details form without checking the
+ has_cisa_representative and has_anything_else_text fields, the form should deny this action"""
+ domain_request = completed_domain_request(name="cisareps.gov", user=self.user, has_anything_else=False)
+
+ self.assertEqual(domain_request.has_anything_else_text, None)
+ self.assertEqual(domain_request.has_cisa_representative, None)
+
+ # prime the form by visiting /edit
+ self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+ # 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)
+
+ additional_details_page = self.app.get(reverse("domain-request:additional_details"))
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ additional_details_form = additional_details_page.forms[0]
+
+ # Submit the form
+ response = additional_details_form.submit()
+
+ self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+ # We expect to see this twice for both fields. This results in a count of 4
+ # due to screen reader information / html.
+ self.assertContains(response, "This question is required.", count=4)
+
def test_submitting_other_contacts_deletes_no_other_contacts_rationale(self):
"""When a user submits the Other Contacts form with other contacts selected, the domain request's
no other contacts rationale gets deleted"""
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 244b47602..f93976138 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -45,7 +45,7 @@ class Step(StrEnum):
PURPOSE = "purpose"
YOUR_CONTACT = "your_contact"
OTHER_CONTACTS = "other_contacts"
- ANYTHING_ELSE = "anything_else"
+ ADDITIONAL_DETAILS = "additional_details"
REQUIREMENTS = "requirements"
REVIEW = "review"
@@ -91,7 +91,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
Step.PURPOSE: _("Purpose of your domain"),
Step.YOUR_CONTACT: _("Your contact information"),
Step.OTHER_CONTACTS: _("Other employees from your organization"),
- Step.ANYTHING_ELSE: _("Anything else?"),
+ Step.ADDITIONAL_DETAILS: _("Additional details"),
Step.REQUIREMENTS: _("Requirements for operating a .gov domain"),
Step.REVIEW: _("Review and submit your domain request"),
}
@@ -365,8 +365,9 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
self.domain_request.other_contacts.exists()
or self.domain_request.no_other_contacts_rationale is not None
),
- "anything_else": (
- self.domain_request.anything_else is not None or self.domain_request.is_policy_acknowledged is not None
+ "additional_details": (
+ (self.domain_request.anything_else is not None and self.domain_request.cisa_representative_email)
+ or self.domain_request.is_policy_acknowledged is not None
),
"requirements": self.domain_request.is_policy_acknowledged is not None,
"review": self.domain_request.is_policy_acknowledged is not None,
@@ -581,9 +582,64 @@ class OtherContacts(DomainRequestWizard):
return all_forms_valid
-class AnythingElse(DomainRequestWizard):
- template_name = "domain_request_anything_else.html"
- forms = [forms.AnythingElseForm]
+class AdditionalDetails(DomainRequestWizard):
+
+ template_name = "domain_request_additional_details.html"
+
+ forms = [
+ forms.CisaRepresentativeYesNoForm,
+ forms.CisaRepresentativeForm,
+ forms.AdditionalDetailsYesNoForm,
+ forms.AdditionalDetailsForm,
+ ]
+
+ def is_valid(self, forms: list) -> bool:
+
+ # Validate Cisa Representative
+ """Overrides default behavior defined in DomainRequestWizard.
+ Depending on value in yes_no forms, marks corresponding data
+ for deletion. Then validates all forms.
+ """
+ cisa_representative_email_yes_no_form = forms[0]
+ cisa_representative_email_form = forms[1]
+ anything_else_yes_no_form = forms[2]
+ anything_else_form = forms[3]
+
+ # ------- Validate cisa representative -------
+ cisa_rep_portion_is_valid = True
+ # test first for yes_no_form validity
+ if cisa_representative_email_yes_no_form.is_valid():
+ # test for existing data
+ if not cisa_representative_email_yes_no_form.cleaned_data.get("has_cisa_representative"):
+ # mark the cisa_representative_email_form for deletion
+ cisa_representative_email_form.mark_form_for_deletion()
+ else:
+ cisa_rep_portion_is_valid = cisa_representative_email_form.is_valid()
+ else:
+ # if yes no form is invalid, no choice has been made
+ # mark the cisa_representative_email_form for deletion
+ cisa_representative_email_form.mark_form_for_deletion()
+ cisa_rep_portion_is_valid = False
+
+ # ------- Validate anything else -------
+ anything_else_portion_is_valid = True
+ # test first for yes_no_form validity
+ if anything_else_yes_no_form.is_valid():
+ # test for existing data
+ if not anything_else_yes_no_form.cleaned_data.get("has_anything_else_text"):
+ # mark the anything_else_form for deletion
+ anything_else_form.mark_form_for_deletion()
+ else:
+ anything_else_portion_is_valid = anything_else_form.is_valid()
+ else:
+ # if yes no form is invalid, no choice has been made
+ # mark the anything_else_form for deletion
+ anything_else_form.mark_form_for_deletion()
+ anything_else_portion_is_valid = False
+
+ # ------- Return combined validation result -------
+ all_forms_valid = cisa_rep_portion_is_valid and anything_else_portion_is_valid
+ return all_forms_valid
class Requirements(DomainRequestWizard):