diff --git a/src/.pa11yci b/src/.pa11yci index 72d14bd93..ce70e8537 100644 --- a/src/.pa11yci +++ b/src/.pa11yci @@ -14,7 +14,6 @@ "http://app:8080/register/purpose/", "http://app:8080/register/your_contact/", "http://app:8080/register/other_contacts/", - "http://app:8080/register/security_email/", "http://app:8080/register/anything_else/", "http://app:8080/register/requirements/", "http://app:8080/register/review/", diff --git a/src/registrar/fixtures.py b/src/registrar/fixtures.py index 4c66bcd2e..36c1733c5 100644 --- a/src/registrar/fixtures.py +++ b/src/registrar/fixtures.py @@ -89,7 +89,6 @@ class DomainApplicationFixture: # "zipcode": None, # "urbanization": None, # "purpose": None, - # "security_email": None, # "anything_else": None, # "is_policy_acknowledged": None, # "authorizing_official": None, @@ -152,7 +151,6 @@ class DomainApplicationFixture: da.zipcode = app["zipcode"] if "zipcode" in app else fake.postalcode() da.urbanization = app["urbanization"] if "urbanization" in app else None da.purpose = app["purpose"] if "purpose" in app else fake.paragraph() - da.security_email = app["security_email"] if "security_email" in app else None da.anything_else = app["anything_else"] if "anything_else" in app else None da.is_policy_acknowledged = ( app["is_policy_acknowledged"] if "is_policy_acknowledged" in app else True diff --git a/src/registrar/migrations/0001_initial.py b/src/registrar/migrations/0001_initial.py index bae8d8636..760344cf3 100644 --- a/src/registrar/migrations/0001_initial.py +++ b/src/registrar/migrations/0001_initial.py @@ -312,15 +312,6 @@ class Migration(migrations.Migration): blank=True, help_text="Purpose of the domain", null=True ), ), - ( - "security_email", - models.CharField( - blank=True, - help_text="Security email for public use", - max_length=320, - null=True, - ), - ), ( "anything_else", models.TextField( diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 7cfda1440..460204a1b 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -440,13 +440,6 @@ class DomainApplication(TimeStampedModel): help_text="Reason for listing no additional contacts", ) - security_email = models.CharField( - max_length=320, - null=True, - blank=True, - help_text="Security email for public use", - ) - anything_else = models.TextField( null=True, blank=True, diff --git a/src/registrar/templates/application_review.html b/src/registrar/templates/application_review.html index 7fed7f924..129fdb83d 100644 --- a/src/registrar/templates/application_review.html +++ b/src/registrar/templates/application_review.html @@ -75,9 +75,6 @@ None {% endfor %} {% endif %} - {% if step == Step.SECURITY_EMAIL %} - {{ application.security_email|default:"None" }} - {% endif %} {% if step == Step.ANYTHING_ELSE %} {{ application.anything_else|default:"No" }} {% endif %} diff --git a/src/registrar/templates/application_security_email.html b/src/registrar/templates/application_security_email.html deleted file mode 100644 index ff9d73c3c..000000000 --- a/src/registrar/templates/application_security_email.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends 'application_form.html' %} -{% load field_helpers %} - -{% block form_instructions %} -

We strongly recommend that you provide a security email. This email will allow the - public to report observed or suspected security issues on your domain. - Security emails are made public. We recommend using an alias, like - security@<domain.gov>.

-{% endblock %} - - -{% block form_fields %} - {% input_with_errors forms.0.security_email %} -{% endblock %} \ No newline at end of file diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index a168f83cb..62155622b 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -402,39 +402,14 @@ class DomainApplicationTests(TestWithUser, WebTest): self.assertEquals(other_contacts_result.status_code, 302) self.assertEquals( - other_contacts_result["Location"], "/register/security_email/" + other_contacts_result["Location"], "/register/anything_else/" ) num_pages_tested += 1 - # ---- SECURITY EMAIL PAGE ---- - # Follow the redirect to the next form page - self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - security_email_page = other_contacts_result.follow() - security_email_form = security_email_page.form - - security_email_form["security_email-security_email"] = "security@city.com" - - # test saving the page - self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - result = security_email_page.form.submit("submit_button", value="save") - # should remain on the same page - self.assertEquals(result["Location"], "/register/security_email/") - # should see results in db - application = DomainApplication.objects.get() # there's only one - self.assertEquals(application.security_email, "security@city.com") - - # test next button - self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - security_email_result = security_email_form.submit() - - self.assertEquals(security_email_result.status_code, 302) - self.assertEquals(security_email_result["Location"], "/register/anything_else/") - num_pages_tested += 1 - # ---- ANYTHING ELSE PAGE ---- # Follow the redirect to the next form page self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - anything_else_page = security_email_result.follow() + anything_else_page = other_contacts_result.follow() anything_else_form = anything_else_page.form anything_else_form["anything_else-anything_else"] = "Nothing else." @@ -516,7 +491,6 @@ class DomainApplicationTests(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, "security@city.com") self.assertContains(review_page, "Nothing else.") # test saving the page @@ -986,7 +960,6 @@ class DomainApplicationTests(TestWithUser, WebTest): organization_type="federal", federal_type="executive", purpose="Purpose of the site", - security_email="security@city.com", anything_else="No", is_policy_acknowledged=True, organization_name="Testorg",