removed print statements

This commit is contained in:
asaki222 2024-10-23 22:05:16 -04:00
parent eb2a5f6a17
commit a9aa8b16ef
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
5 changed files with 23 additions and 29 deletions

View file

@ -1,28 +1,28 @@
<address> <address>
{% if organization.converted_federal_agency %} {% if organization.federal_agency %}
{{ organization.converted_federal_agency }}<br /> {{ organization.federal_agency }}<br />
{% endif %} {% endif %}
{% if organization.converted_organization_name %} {% if organization.organization_name %}
{{ organization.converted_organization_name }} {{ organization.organization_name }}
{% endif %} {% endif %}
{% if organization.converted_address_line1 %} {% if organization.address_line1 %}
<br />{{ organization.converted_address_line1 }} <br />{{ organization.address_line1 }}
{% endif %} {% endif %}
{% if organization.converted_address_line2 %} {% if organization.address_line2 %}
<br />{{ organization.converted_address_line2 }} <br />{{ organization.address_line2 }}
{% endif %} {% endif %}
{% if organization.converted_city %} {% if organization.city %}
<br />{{ organization.converted_city}}{% if organization.converted_state_territory %},&nbsp; <br />{{ organization.city}}{% if organization.state_territory %},&nbsp;
{% else %}<br /> {% else %}<br />
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if organization.converted_state_territory %} {% if organization.state_territory %}
{{ organization.converted_state_territory }} {{ organization.state_territory }}
{% endif %} {% endif %}
{% if organization.converted_zipcode %} {% if organization.zipcode %}
<br />{{ organization.converted_zipcode }} <br />{{ organization.zipcode }}
{% endif %} {% endif %}
{% if organization.converted_urbanization %} {% if organization.urbanization %}
<br />{{ organization.converted_urbanization }} <br />{{ organization.urbanization }}
{% endif %} {% endif %}
</address> </address>

View file

@ -8,8 +8,8 @@
{% endif %} {% endif %}
{% if step == Step.ORGANIZATION_TYPE %} {% if step == Step.ORGANIZATION_TYPE %}
{% if domain_request.converted_generic_org_type is not None %} {% if domain_request.generic_org_type is not None %}
{% with title=form_titles|get_item:step value=domain_request.converted_generic_org_type_display|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %} {% with title=form_titles|get_item:step value=domain_request.generic_org_type_display|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %} {% endwith %}
{% else %} {% else %}
@ -29,7 +29,7 @@
{% if step == Step.ORGANIZATION_FEDERAL %} {% if step == Step.ORGANIZATION_FEDERAL %}
{% with title=form_titles|get_item:step value=domain_request.converted_federal_type|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %} {% with title=form_titles|get_item:step value=domain_request.federal_type|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %} {% endwith %}
{% endif %} {% endif %}
@ -41,7 +41,7 @@
{% endif %} {% endif %}
{% if step == Step.ORGANIZATION_CONTACT %} {% if step == Step.ORGANIZATION_CONTACT %}
{% if domain_request.converted_organization_name %} {% if domain_request.organization_name %}
{% with title=form_titles|get_item:step value=domain_request %} {% with title=form_titles|get_item:step value=domain_request %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url address='true' %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url address='true' %}
{% endwith %} {% endwith %}

View file

@ -146,7 +146,7 @@
{% block request_summary %} {% block request_summary %}
{% with heading_level='h3' %} {% with heading_level='h3' %}
{% with org_type=DomainRequest.converted_generic_org_type_display %} {% with org_type=DomainRequest.generic_org_type_display %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %} {% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %} {% endwith %}

View file

@ -576,13 +576,6 @@ class TestDomainRequestAdmin(MockEppLib):
response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal") response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal")
# There are 2 template references to Federal (4) and two in the results data # There are 2 template references to Federal (4) and two in the results data
# of the request # of the request
html_content = response.content.decode('utf-8')
# Write the HTML content to a file
with open("output.html", "w", encoding="utf-8") as html_file:
html_file.write(html_content)
self.assertContains(response, "Federal", count=48)
# This may be a bit more robust # This may be a bit more robust
self.assertContains(response, '<td class="field-converted_generic_org_type">federal</td>', count=1) self.assertContains(response, '<td class="field-converted_generic_org_type">federal</td>', count=1)
# Now let's make sure the long description does not exist # Now let's make sure the long description does not exist

View file

@ -249,6 +249,7 @@ class DomainRequestTests(TestWithUser, WebTest):
type_result = type_form.submit() type_result = type_form.submit()
# should see results in db # should see results in db
domain_request = DomainRequest.objects.get() # there's only one domain_request = DomainRequest.objects.get() # there's only one
print(domain_request.generic_org_type)
self.assertEqual(domain_request.generic_org_type, "federal") self.assertEqual(domain_request.generic_org_type, "federal")
# 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
@ -487,7 +488,7 @@ class DomainRequestTests(TestWithUser, WebTest):
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
review_page = requirements_result.follow() review_page = requirements_result.follow()
review_form = review_page.forms[0] review_form = review_page.forms[0]
print(review_page)
# Review page contains all the previously entered data # Review page contains all the previously entered data
# Let's make sure the long org name is displayed # Let's make sure the long org name is displayed
self.assertContains(review_page, "Federal") self.assertContains(review_page, "Federal")