Fix merge issues

This commit is contained in:
Neil Martinsen-Burrell 2023-06-01 13:50:58 -05:00
parent c68a8457f0
commit b5706c3829
No known key found for this signature in database
GPG key ID: 6A3C818CC10D0184
2 changed files with 2 additions and 44 deletions

View file

@ -1,44 +0,0 @@
# Generated by Django 4.2 on 2023-05-22 17:35
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("registrar", "0020_remove_domaininformation_security_email"),
]
operations = [
migrations.AlterField(
model_name="contact",
name="first_name",
field=models.TextField(
blank=True,
db_index=True,
help_text="First name",
null=True,
verbose_name="first name / given name",
),
),
migrations.AlterField(
model_name="contact",
name="last_name",
field=models.TextField(
blank=True,
db_index=True,
help_text="Last name",
null=True,
verbose_name="last name / family name",
),
),
migrations.AlterField(
model_name="contact",
name="title",
field=models.TextField(
blank=True,
help_text="Title",
null=True,
verbose_name="title or role in your organization",
),
),
]

View file

@ -1312,6 +1312,8 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest):
self.domain_information.save()
page = self.app.get(
reverse("domain-authorizing-official", kwargs={"pk": self.domain.id})
)
self.assertContains(page, "Testy")
def test_domain_your_contact_information(self):
"""Can load domain's your contact information page."""