merged with main and resolved conflicts

This commit is contained in:
Alysia Broddrick 2023-10-02 09:20:36 -07:00
commit 18c3e0e96f
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
36 changed files with 789 additions and 109 deletions

View file

@ -457,6 +457,7 @@ def completed_application(
has_anything_else=True,
status=DomainApplication.STARTED,
user=False,
name="city.gov",
):
"""A completed domain application."""
if not user:
@ -468,7 +469,7 @@ def completed_application(
email="testy@town.com",
phone="(555) 555 5555",
)
domain, _ = DraftDomain.objects.get_or_create(name="city.gov")
domain, _ = DraftDomain.objects.get_or_create(name=name)
alt, _ = Website.objects.get_or_create(website="city1.gov")
current, _ = Website.objects.get_or_create(website="city.com")
you, _ = Contact.objects.get_or_create(