Before your domain can be used we'll need information about your domain name servers.
From 611242b74af7c6066468ffcf6d95b01da463e449 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:13:44 -0700 Subject: [PATCH 05/10] Rename Contact Information page title --- src/registrar/templates/domain_your_contact_information.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_your_contact_information.html b/src/registrar/templates/domain_your_contact_information.html index 81c62584c..b776e59c2 100644 --- a/src/registrar/templates/domain_your_contact_information.html +++ b/src/registrar/templates/domain_your_contact_information.html @@ -5,7 +5,7 @@ {% block domain_content %} -If you’d like us to use a different name, email, or phone number you can make those changes below. Updating your contact information here will update the contact information for all domains in your account. However, it won’t affect your Login.gov account information.
From 687f369d18828a25cf57f12d0b29e11d893939ae Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:14:27 -0700 Subject: [PATCH 06/10] Rename Security Email page title --- src/registrar/templates/domain_security_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8175fa394..341312ae7 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -5,7 +5,7 @@ {% block domain_content %} -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 and included in the .gov domain data we provide.
From 8c6b4f51e888341613aae1e12e2743b1991f2189 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:30:39 -0700 Subject: [PATCH 07/10] Rename block titles --- src/registrar/templates/domain_nameservers.html | 2 +- src/registrar/templates/domain_security_email.html | 2 +- src/registrar/templates/domain_your_contact_information.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html index eddb77dca..a7371ee0b 100644 --- a/src/registrar/templates/domain_nameservers.html +++ b/src/registrar/templates/domain_nameservers.html @@ -1,7 +1,7 @@ {% extends "domain_base.html" %} {% load static field_helpers%} -{% block title %}Domain name servers | {{ domain.name }} | {% endblock %} +{% block title %}DNS name servers | {{ domain.name }} | {% endblock %} {% block domain_content %} {# this is right after the messages block in the parent template #} diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 341312ae7..cb3af5725 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -1,7 +1,7 @@ {% extends "domain_base.html" %} {% load static field_helpers url_helpers %} -{% block title %}Domain security email | {{ domain.name }} | {% endblock %} +{% block title %}Security email | {{ domain.name }} | {% endblock %} {% block domain_content %} diff --git a/src/registrar/templates/domain_your_contact_information.html b/src/registrar/templates/domain_your_contact_information.html index b776e59c2..e2cad735f 100644 --- a/src/registrar/templates/domain_your_contact_information.html +++ b/src/registrar/templates/domain_your_contact_information.html @@ -1,7 +1,7 @@ {% extends "domain_base.html" %} {% load static field_helpers %} -{% block title %}Domain contact information | {{ domain.name }} | {% endblock %} +{% block title %}Your contact information | {{ domain.name }} | {% endblock %} {% block domain_content %} From 6a53a4a76b068c3891ab45662168e259d798dee0 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:38:08 -0700 Subject: [PATCH 08/10] Update tests --- src/registrar/tests/test_views.py | 10 +++++----- ~ | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 ~ diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 68aaf0ed8..2194b42db 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -1309,7 +1309,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): page = self.client.get( reverse("domain-nameservers", kwargs={"pk": self.domain.id}) ) - self.assertContains(page, "Domain name servers") + self.assertContains(page, "DNS name servers") @skip("Broken by adding registry connection fix in ticket 848") def test_domain_nameservers_form(self): @@ -1414,7 +1414,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): page = self.client.get( reverse("domain-your-contact-information", kwargs={"pk": self.domain.id}) ) - self.assertContains(page, "Domain contact information") + self.assertContains(page, "Your contact information") def test_domain_your_contact_information_content(self): """Logged-in user's contact information appears on the page.""" @@ -1439,7 +1439,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): ) # Loads correctly - self.assertContains(page, "Domain security email") + self.assertContains(page, "Security email") self.assertContains(page, "security@mail.gov") self.mockSendPatch.stop() @@ -1455,7 +1455,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): ) # Loads correctly - self.assertContains(page, "Domain security email") + self.assertContains(page, "Security email") self.assertNotContains(page, "dotgov@cisa.dhs.gov") self.mockSendPatch.stop() @@ -1464,7 +1464,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest, MockEppLib): page = self.client.get( reverse("domain-security-email", kwargs={"pk": self.domain.id}) ) - self.assertContains(page, "Domain security email") + self.assertContains(page, "Security email") def test_domain_security_email_form(self): """Adding a security email works. diff --git a/~ b/~ new file mode 100644 index 000000000..88f4c565d --- /dev/null +++ b/~ @@ -0,0 +1,6 @@ +GPG_TTY=$(tty) +export GPG_TTY + + #Add RVM to PATH for scripting. Make sure this is the last PATH variable change + +export PATH="$PATH:$HOME/.rvm/bin" From c99588687f26d2fc199ea22c08c1109edd28fe58 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:40:42 -0700 Subject: [PATCH 09/10] Remove ~ --- ~ | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 ~ diff --git a/~ b/~ deleted file mode 100644 index 88f4c565d..000000000 --- a/~ +++ /dev/null @@ -1,6 +0,0 @@ -GPG_TTY=$(tty) -export GPG_TTY - - #Add RVM to PATH for scripting. Make sure this is the last PATH variable change - -export PATH="$PATH:$HOME/.rvm/bin" From 3c33b079f1e9a28fd911d7ac856bf0d955971568 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:11:51 -0600 Subject: [PATCH 10/10] Removed comment --- src/registrar/models/domain.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 85606ba88..82f2c2cf4 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -718,7 +718,6 @@ class Domain(TimeStampedModel, DomainHelper): if not isinstance(contact, eppInfo.InfoContactResultData): raise ContactError("Contact must be of type InfoContactResultData") - # temp comment for push - will remove auth_info = contact.auth_info postal_info = contact.postal_info addr = postal_info.addr