Before your domain can be used we’ll need information about your domain name servers. Name server records indicate which DNS server is authoritative for your domain.
- Add a name server record by entering the address (e.g., ns1.nameserver.com) in the name server fields below. You may add up to 13 name servers.
+ Add a name server record by entering the address (e.g., ns1.nameserver.com) in the name server fields below. You must add at least two name servers (13 max).
diff --git a/src/registrar/tests/test_nameserver_error.py b/src/registrar/tests/test_nameserver_error.py
index 0657b6599..89a6dfcce 100644
--- a/src/registrar/tests/test_nameserver_error.py
+++ b/src/registrar/tests/test_nameserver_error.py
@@ -10,7 +10,7 @@ class TestNameserverError(TestCase):
def test_with_no_ip(self):
"""Test NameserverError when no ip address is passed"""
nameserver = "nameserver val"
- expected = "Subdomains require an IP address"
+ expected = "Using your domain for a name server requires an IP address"
nsException = NameserverError(
code=nsErrorCodes.MISSING_IP, nameserver=nameserver
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 59a4ab700..28384ca91 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1440,7 +1440,7 @@ class TestDomainNameservers(TestDomainOverview):
result,
str(NameserverError(code=NameserverErrorCodes.MISSING_IP)),
count=2,
- status_code=200
+ status_code=200,
)
def test_domain_nameservers_form_submit_missing_host(self):
@@ -1466,7 +1466,7 @@ class TestDomainNameservers(TestDomainOverview):
result,
str(NameserverError(code=NameserverErrorCodes.MISSING_HOST)),
count=2,
- status_code=200
+ status_code=200,
)
def test_domain_nameservers_form_submit_glue_record_not_allowed(self):
@@ -1495,11 +1495,9 @@ class TestDomainNameservers(TestDomainOverview):
# the required field. nameserver has ip but missing host
self.assertContains(
result,
- str(NameserverError(
- code=NameserverErrorCodes.GLUE_RECORD_NOT_ALLOWED
- )),
+ str(NameserverError(code=NameserverErrorCodes.GLUE_RECORD_NOT_ALLOWED)),
count=2,
- status_code=200
+ status_code=200,
)
def test_domain_nameservers_form_submit_invalid_ip(self):
@@ -1526,12 +1524,13 @@ class TestDomainNameservers(TestDomainOverview):
# the required field. nameserver has ip but missing host
self.assertContains(
result,
- str(NameserverError(
- code=NameserverErrorCodes.INVALID_IP,
- nameserver=nameserver
- )),
+ str(
+ NameserverError(
+ code=NameserverErrorCodes.INVALID_IP, nameserver=nameserver
+ )
+ ),
count=2,
- status_code=200
+ status_code=200,
)
def test_domain_nameservers_form_submits_successfully(self):
@@ -1565,29 +1564,6 @@ class TestDomainNameservers(TestDomainOverview):
page = result.follow()
self.assertContains(page, "The name servers for this domain have been updated")
- # self.assertContains(result, "This field is required.", count=2, status_code=200)
- # add a second name server, which is a subdomain, but don't
- # submit the required ip
- # nameservers_page.form["form-1-server"] = "ns1.igorville.gov"
- # with less_console_noise(): # swallow log warning message
- # result = nameservers_page.form.submit()
- # # form submission was a post with an error, response should be a 200
- # self.assertContains(
- # result,
- # str(NameserverError(code=NameserverErrorCodes.MISSING_IP)),
- # count=2,
- # status_code=200
- # )
- # form submission was a post, response should be a redirect
- # self.assertEqual(result.status_code, 302)
- # self.assertEqual(
- # result["Location"],
- # reverse("domain-dns-nameservers", kwargs={"pk": self.domain.id}),
- # )
- # self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
- # page = result.follow()
- # self.assertContains(page, "The name servers for this domain have been updated")
-
def test_domain_nameservers_form_invalid(self):
"""Can change domain's nameservers.
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 64c86ee01..c1d3c5849 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -83,7 +83,9 @@ class NameserverError(Exception):
"""
_error_mapping = {
- NameserverErrorCodes.MISSING_IP: "Subdomains require an IP address",
+ NameserverErrorCodes.MISSING_IP: (
+ "Using your domain for a name server requires an IP address"
+ ),
NameserverErrorCodes.GLUE_RECORD_NOT_ALLOWED: (
"Name server address does not match domain name"
),
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index da501b273..f795c4333 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -254,18 +254,15 @@ class DomainNameserversView(DomainFormBaseView):
def get_form(self, **kwargs):
"""Override the labels and required fields every time we get a formset."""
- # kwargs.update({"domain", self.object})
formset = super().get_form(**kwargs)
for i, form in enumerate(formset):
- # form = self.get_form(self, **kwargs)
form.fields["server"].label += f" {i+1}"
if i < 2:
form.fields["server"].required = True
else:
form.fields["server"].required = False
form.fields["domain"].initial = self.object.name
- print(f"domain in get_form {self.object.name}")
return formset
def post(self, request, *args, **kwargs):