test fix (also fixed error in summary page)

This commit is contained in:
CocoByte 2024-04-15 18:08:06 -06:00
parent 78c0f470f2
commit 8a9727e4c0
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
4 changed files with 21 additions and 14 deletions

View file

@ -156,7 +156,7 @@
{% if step == Step.ADDITIONAL_DETAILS %} {% if step == Step.ADDITIONAL_DETAILS %}
{% include "includes/summary_additional_details.html" with domainRequest=DomainRequest %} {% include "includes/summary_additional_details.html" with domainRequest=domain_request %}
{% endif %} {% endif %}

View file

@ -26,7 +26,7 @@ and condense down into one subsection) -->
</dt> </dt>
<dd> <dd>
{% if domainRequest.has_cisa_representative %} {% if domainRequest.has_cisa_representative %}
domainRequest.cisa_representative_email {{domainRequest.cisa_representative_email}}
{% else %} {% else %}
(none) (none)
{% endif %} {% endif %}
@ -36,7 +36,7 @@ and condense down into one subsection) -->
</dt> </dt>
<dd> <dd>
{% if domainRequest.has_anything_else_text %} {% if domainRequest.has_anything_else_text %}
domainRequest.anything_else {{domainRequest.anything_else}}
{% else %} {% else %}
No No
{% endif %} {% endif %}

View file

@ -356,33 +356,39 @@ class DomainRequestTests(TestWithUser, WebTest):
# the post request should return a redirect to the next form in # the post request should return a redirect to the next form in
# the domain request page # the domain request page
self.assertEqual(other_contacts_result.status_code, 302) 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 num_pages_tested += 1
# ---- ANYTHING ELSE PAGE ---- # ---- ADDITIONAL DETAILS PAGE ----
# Follow the redirect to the next form page # Follow the redirect to the next form page
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
anything_else_page = other_contacts_result.follow() additional_details_page = other_contacts_result.follow()
anything_else_form = anything_else_page.forms[0] 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 # test next button
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) 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 # validate that data from this step are being saved
domain_request = DomainRequest.objects.get() # there's only one 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.") self.assertEqual(domain_request.anything_else, "Nothing else.")
# the post request should return a redirect to the next form in # the post request should return a redirect to the next form in
# the domain request page # the domain request page
self.assertEqual(anything_else_result.status_code, 302) self.assertEqual(additional_details_result.status_code, 302)
self.assertEqual(anything_else_result["Location"], "/request/requirements/") self.assertEqual(additional_details_result["Location"], "/request/requirements/")
num_pages_tested += 1 num_pages_tested += 1
# ---- REQUIREMENTS PAGE ---- # ---- REQUIREMENTS PAGE ----
# Follow the redirect to the next form page # Follow the redirect to the next form page
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) 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_page.forms[0]
requirements_form["requirements-is_policy_acknowledged"] = True 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, "Another Tester")
self.assertContains(review_page, "testy2@town.com") self.assertContains(review_page, "testy2@town.com")
self.assertContains(review_page, "(201) 555-5557") self.assertContains(review_page, "(201) 555-5557")
self.assertContains(review_page, "FakeEmail@gmail.com")
self.assertContains(review_page, "Nothing else.") self.assertContains(review_page, "Nothing else.")
# We can't test the modal itself as it relies on JS for init and triggering, # We can't test the modal itself as it relies on JS for init and triggering,

View file

@ -45,7 +45,7 @@ class Step(StrEnum):
PURPOSE = "purpose" PURPOSE = "purpose"
YOUR_CONTACT = "your_contact" YOUR_CONTACT = "your_contact"
OTHER_CONTACTS = "other_contacts" OTHER_CONTACTS = "other_contacts"
ADDITIONAL_DETAILS = "anything_else" ADDITIONAL_DETAILS = "additional_details"
REQUIREMENTS = "requirements" REQUIREMENTS = "requirements"
REVIEW = "review" REVIEW = "review"
@ -365,7 +365,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
self.domain_request.other_contacts.exists() self.domain_request.other_contacts.exists()
or self.domain_request.no_other_contacts_rationale is not None or self.domain_request.no_other_contacts_rationale is not None
), ),
"anything_else": ( "additional_details": (
(self.domain_request.anything_else is not None and self.domain_request.cisa_representative_email) (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 or self.domain_request.is_policy_acknowledged is not None
), ),