Add logging, templatize SUMMARY in email templates, templatize complete_application in tests, to integrate FSM inspect the status change that was made in the admin view here and call the transition method that's now defined in the model

src/registrar/admin.py

@@ -4,7 +4,6 @@ from django.contrib.auth.admin import UserAdmin
 from django.contrib.contenttypes.models import ContentType
 from django.http.response import HttpResponseRedirect
 from django.urls import reverse
-from .utility.email import send_templated_email, EmailSendingError
 from . import models
 
 logger = logging.getLogger(__name__)
@@ -63,30 +62,16 @@ class DomainApplicationAdmin(AuditedAdmin):
             # Get the original application from the database
             original_obj = models.DomainApplication.objects.get(pk=obj.pk)
 
-            if obj.status != original_obj.status and obj.status == "investigating":
             if (
-                    original_obj.submitter is None
+                obj.status != original_obj.status
-                    or original_obj.submitter.email is None
+                and obj.status == models.DomainApplication.INVESTIGATING
             ):
-                    logger.warning(
+                # This is a transition annotated method in model which will throw an
-                        "Cannot send status change (in review) email,"
+                # error if the condition is violated. To make this work, we need to
-                        "no submitter email address."
+                # call it  on the original object which has the right status value,
-                    )
+                # but pass the current object which contains the up-to-date data
-                    return
+                # for the email.
-                try:
+                original_obj.in_review(obj)
-                    print(
-                        f"original_obj.submitter.email {original_obj.submitter.email}"
-                    )
-                    send_templated_email(
-                        "emails/status_change_in_review.txt",
-                        "emails/status_change_in_review_subject.txt",
-                        original_obj.submitter.email,
-                        context={"application": obj},
-                    )
-                except EmailSendingError:
-                    logger.warning(
-                        "Failed to send status change (in review) email", exc_info=True
-                    )
 
         super().save_model(request, obj, form, change)
 

src/registrar/models/domain_application.py

@@ -484,6 +484,9 @@ class DomainApplication(TimeStampedModel):
             )
             return
         try:
+            logger.info(
+                f"Submission confirmation email sent to: {self.submitter.email}"
+            )
             send_templated_email(
                 "emails/submission_confirmation.txt",
                 "emails/submission_confirmation_subject.txt",
@@ -493,6 +496,32 @@ class DomainApplication(TimeStampedModel):
         except EmailSendingError:
             logger.warning("Failed to send confirmation email", exc_info=True)
 
+    def _send_in_review_email(self):
+        """Send an email that this application is now in review.
+
+        The email goes to the email address that the submitter gave as their
+        contact information. If there is not submitter information, then do
+        nothing.
+        """
+        if self.submitter is None or self.submitter.email is None:
+            logger.warning(
+                "Cannot send status change (in review) email,"
+                "no submitter email address."
+            )
+            return
+        try:
+            logging.info(f"In review email sent to: {self.submitter.email}")
+            send_templated_email(
+                "emails/status_change_in_review.txt",
+                "emails/status_change_in_review_subject.txt",
+                self.submitter.email,
+                context={"application": self},
+            )
+        except EmailSendingError:
+            logger.warning(
+                "Failed to send status change (in review) email", exc_info=True
+            )
+
     @transition(field="status", source=[STARTED, WITHDRAWN], target=SUBMITTED)
     def submit(self):
         """Submit an application that is started."""
@@ -541,6 +570,14 @@ class DomainApplication(TimeStampedModel):
             user=self.creator, domain=created_domain, role=UserDomainRole.Roles.ADMIN
         )
 
+    @transition(field="status", source=SUBMITTED, target=INVESTIGATING)
+    def in_review(self, updated_domain_application):
+        """Investigate an application that has been submitted."""
+
+        # When an application is moved to in review, we need to send a
+        # confirmation email. This is a side-effect of the state transition
+        updated_domain_application._send_in_review_email()
+
     # ## Form policies ###
     #
     # These methods control what questions need to be answered by applicants

src/registrar/templates/emails/includes/application_summary.txt

@@ -0,0 +1,39 @@
+SUMMARY OF YOUR DOMAIN REQUEST
+
+Type of organization:
+{{ application.get_organization_type_display }}
+
+Organization name and mailing address:
+{% spaceless %}{{ application.organization_name }}
+{{ application.address_line1 }}{% if  application.address_line2  %}
+{{ application.address_line2 }}{% endif %}
+{{ application.city }}, {{ application.state_territory }}
+{{ application.zipcode }}{% if application.urbanization  %}
+{{ application.urbanization }}{% endif %}{% endspaceless %}
+{% if application.type_of_work %}{# if block makes one newline if it's false #}
+Type of work:
+{% spaceless %}{{ application.type_of_work }}{% endspaceless %}
+{% endif %}
+Authorizing official:
+{% spaceless %}{% include "emails/includes/contact.txt" with contact=application.authorizing_official %}{% endspaceless %}
+{% if application.current_websites.exists %}{# if block makes a newline #}
+Current website for your organization: {% for site in application.current_websites.all %}
+{% spaceless %}{{ site.website }}{% endspaceless %}
+{% endfor %}{% endif %}
+.gov domain:
+{{ application.requested_domain.name }}
+{% for site in application.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}
+{% endfor %}
+Purpose of your domain:
+{{ application.purpose }}
+
+Your contact information:
+{% spaceless %}{% include "emails/includes/contact.txt" with contact=application.submitter %}{% endspaceless %}
+{% if application.other_contacts.all %}
+Other employees from your organization:
+{% for other in application.other_contacts.all %}
+{% spaceless %}{% include "emails/includes/contact.txt" with contact=other %}{% endspaceless %}
+{% endfor %}{% endif %}{% if application.anything_else %}
+Anything else we should know?
+{{ application.anything_else }}
+{% endif %}

src/registrar/templates/emails/status_change_in_review.txt

@@ -34,45 +34,7 @@ requesting a .gov domain.
 
 ----------------------------------------------------------------
 
-SUMMARY OF YOUR DOMAIN REQUEST
+{% include 'emails/includes/application_summary.txt' %}
-
-Type of organization:
-{{ application.get_organization_type_display }}
-
-Organization name and mailing address:
-{% spaceless %}{{ application.organization_name }}
-{{ application.address_line1 }}{% if  application.address_line2  %}
-{{ application.address_line2 }}{% endif %}
-{{ application.city }}, {{ application.state_territory }}
-{{ application.zipcode }}{% if application.urbanization  %}
-{{ application.urbanization }}{% endif %}{% endspaceless %}
-{% if application.type_of_work %}{# if block makes one newline if it's false #}
-Type of work:
-{% spaceless %}{{ application.type_of_work }}{% endspaceless %}
-{% endif %}
-Authorizing official:
-{% spaceless %}{% include "emails/includes/contact.txt" with contact=application.authorizing_official %}{% endspaceless %}
-{% if application.current_websites.exists %}{# if block makes a newline #}
-Current website for your organization: {% for site in application.current_websites.all %}
-{% spaceless %}{{ site.website }}{% endspaceless %}
-{% endfor %}{% endif %}
-.gov domain:
-{{ application.requested_domain.name }}
-{% for site in application.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}
-{% endfor %}
-Purpose of your domain:
-{{ application.purpose }}
-
-Your contact information:
-{% spaceless %}{% include "emails/includes/contact.txt" with contact=application.submitter %}{% endspaceless %}
-{% if application.other_contacts.all %}
-Other employees from your organization:
-{% for other in application.other_contacts.all %}
-{% spaceless %}{% include "emails/includes/contact.txt" with contact=other %}{% endspaceless %}
-{% endfor %}{% endif %}{% if application.anything_else %}
-Anything else we should know?
-{{ application.anything_else }}
-{% endif %}
 ----------------------------------------------------------------
 
 The .gov team

src/registrar/templates/emails/submission_confirmation.txt

@@ -33,45 +33,7 @@ requesting a .gov domain.
 
 ----------------------------------------------------------------
 
-SUMMARY OF YOUR DOMAIN REQUEST
+{% include 'emails/includes/application_summary.txt' %}
-
-Type of organization:
-{{ application.get_organization_type_display }}
-
-Organization name and mailing address:
-{% spaceless %}{{ application.organization_name }}
-{{ application.address_line1 }}{% if  application.address_line2  %}
-{{ application.address_line2 }}{% endif %}
-{{ application.city }}, {{ application.state_territory }}
-{{ application.zipcode }}{% if application.urbanization  %}
-{{ application.urbanization }}{% endif %}{% endspaceless %}
-{% if application.type_of_work %}{# if block makes one newline if it's false #}
-Type of work:
-{% spaceless %}{{ application.type_of_work }}{% endspaceless %}
-{% endif %}
-Authorizing official:
-{% spaceless %}{% include "emails/includes/contact.txt" with contact=application.authorizing_official %}{% endspaceless %}
-{% if application.current_websites.exists %}{# if block makes a newline #}
-Current website for your organization: {% for site in application.current_websites.all %}
-{% spaceless %}{{ site.website }}{% endspaceless %}
-{% endfor %}{% endif %}
-.gov domain:
-{{ application.requested_domain.name }}
-{% for site in application.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}
-{% endfor %}
-Purpose of your domain:
-{{ application.purpose }}
-
-Your contact information:
-{% spaceless %}{% include "emails/includes/contact.txt" with contact=application.submitter %}{% endspaceless %}
-{% if application.other_contacts.all %}
-Other employees from your organization:
-{% for other in application.other_contacts.all %}
-{% spaceless %}{% include "emails/includes/contact.txt" with contact=other %}{% endspaceless %}
-{% endfor %}{% endif %}{% if application.anything_else %}
-Anything else we should know?
-{{ application.anything_else }}
-{% endif %}
 ----------------------------------------------------------------
 
 The .gov team

src/registrar/tests/common.py

@@ -8,6 +8,8 @@ from typing import List, Dict
 from django.conf import settings
 from django.contrib.auth import get_user_model, login
 
+from registrar.models import Contact, DraftDomain, Website, DomainApplication
+
 
 def get_handlers():
     """Obtain pointers to all StreamHandlers."""
@@ -84,3 +86,74 @@ class MockSESClient(Mock):
 
     def send_email(self, *args, **kwargs):
         self.EMAILS_SENT.append({"args": args, "kwargs": kwargs})
+
+
+def completed_application(
+    has_other_contacts=True,
+    has_current_website=True,
+    has_alternative_gov_domain=True,
+    has_type_of_work=True,
+    has_anything_else=True,
+    status=DomainApplication.STARTED,
+    user=False,
+):
+    """A completed domain application."""
+    if not user:
+        user = get_user_model().objects.create(username="username")
+    ao, _ = Contact.objects.get_or_create(
+        first_name="Testy",
+        last_name="Tester",
+        title="Chief Tester",
+        email="testy@town.com",
+        phone="(555) 555 5555",
+    )
+    domain, _ = DraftDomain.objects.get_or_create(name="city.gov")
+    alt, _ = Website.objects.get_or_create(website="city1.gov")
+    current, _ = Website.objects.get_or_create(website="city.com")
+    you, _ = Contact.objects.get_or_create(
+        first_name="Testy you",
+        last_name="Tester you",
+        title="Admin Tester",
+        email="mayor@igorville.gov",
+        phone="(555) 555 5556",
+    )
+    other, _ = Contact.objects.get_or_create(
+        first_name="Testy2",
+        last_name="Tester2",
+        title="Another Tester",
+        email="testy2@town.com",
+        phone="(555) 555 5557",
+    )
+    domain_application_kwargs = dict(
+        organization_type="federal",
+        federal_type="executive",
+        purpose="Purpose of the site",
+        is_policy_acknowledged=True,
+        organization_name="Testorg",
+        address_line1="address 1",
+        address_line2="address 2",
+        state_territory="NY",
+        zipcode="10002",
+        authorizing_official=ao,
+        requested_domain=domain,
+        submitter=you,
+        creator=user,
+        status=status,
+    )
+    if has_type_of_work:
+        domain_application_kwargs["type_of_work"] = "e-Government"
+    if has_anything_else:
+        domain_application_kwargs["anything_else"] = "There is more"
+
+    application, _ = DomainApplication.objects.get_or_create(
+        **domain_application_kwargs
+    )
+
+    if has_other_contacts:
+        application.other_contacts.add(other)
+    if has_current_website:
+        application.current_websites.add(current)
+    if has_alternative_gov_domain:
+        application.alternative_domains.add(alt)
+
+    return application

src/registrar/tests/test_admin.py

@@ -1,8 +1,8 @@
 from django.test import TestCase, RequestFactory
 from django.contrib.admin.sites import AdminSite
 from registrar.admin import DomainApplicationAdmin
-from django.contrib.auth import get_user_model
+from registrar.models import DomainApplication, User
-from registrar.models import Contact, DraftDomain, Website, DomainApplication, User
+from .common import completed_application
 
 from django.conf import settings
 from unittest.mock import MagicMock
@@ -14,73 +14,6 @@ class TestDomainApplicationAdmin(TestCase):
         self.site = AdminSite()
         self.factory = RequestFactory()
 
-    def _completed_application(
-        self,
-        has_other_contacts=True,
-        has_current_website=True,
-        has_alternative_gov_domain=True,
-        has_type_of_work=True,
-        has_anything_else=True,
-    ):
-        """A completed domain application."""
-        user = get_user_model().objects.create(username="username")
-        ao, _ = Contact.objects.get_or_create(
-            first_name="Testy",
-            last_name="Tester",
-            title="Chief Tester",
-            email="testy@town.com",
-            phone="(555) 555 5555",
-        )
-        domain, _ = DraftDomain.objects.get_or_create(name="city.gov")
-        alt, _ = Website.objects.get_or_create(website="city1.gov")
-        current, _ = Website.objects.get_or_create(website="city.com")
-        you, _ = Contact.objects.get_or_create(
-            first_name="Testy you",
-            last_name="Tester you",
-            title="Admin Tester",
-            email="mayor@igorville.gov",
-            phone="(555) 555 5556",
-        )
-        other, _ = Contact.objects.get_or_create(
-            first_name="Testy2",
-            last_name="Tester2",
-            title="Another Tester",
-            email="testy2@town.com",
-            phone="(555) 555 5557",
-        )
-        domain_application_kwargs = dict(
-            organization_type="federal",
-            federal_type="executive",
-            purpose="Purpose of the site",
-            is_policy_acknowledged=True,
-            organization_name="Testorg",
-            address_line1="address 1",
-            address_line2="address 2",
-            state_territory="NY",
-            zipcode="10002",
-            authorizing_official=ao,
-            requested_domain=domain,
-            submitter=you,
-            creator=user,
-        )
-        if has_type_of_work:
-            domain_application_kwargs["type_of_work"] = "e-Government"
-        if has_anything_else:
-            domain_application_kwargs["anything_else"] = "There is more"
-
-        application, _ = DomainApplication.objects.get_or_create(
-            **domain_application_kwargs
-        )
-
-        if has_other_contacts:
-            application.other_contacts.add(other)
-        if has_current_website:
-            application.current_websites.add(current)
-        if has_alternative_gov_domain:
-            application.alternative_domains.add(alt)
-
-        return application
-
     @boto3_mocking.patching
     def test_save_model_sends_email_on_property_change(self):
         # make sure there is no user with this email
@@ -92,7 +25,7 @@ class TestDomainApplicationAdmin(TestCase):
 
         with boto3_mocking.clients.handler_for("sesv2", mock_client):
             # Create a sample application
-            application = self._completed_application()
+            application = completed_application(status=DomainApplication.SUBMITTED)
 
             # Create a mock request
             request = self.factory.post(

src/registrar/tests/test_emails.py

@@ -2,82 +2,14 @@
 
 from unittest.mock import MagicMock
 
-from django.contrib.auth import get_user_model
 from django.test import TestCase
+from .common import completed_application
 
-from registrar.models import Contact, DraftDomain, Website, DomainApplication
 
 import boto3_mocking  # type: ignore
 
 
 class TestEmails(TestCase):
-    def _completed_application(
-        self,
-        has_other_contacts=True,
-        has_current_website=True,
-        has_alternative_gov_domain=True,
-        has_type_of_work=True,
-        has_anything_else=True,
-    ):
-        """A completed domain application."""
-        user = get_user_model().objects.create(username="username")
-        ao, _ = Contact.objects.get_or_create(
-            first_name="Testy",
-            last_name="Tester",
-            title="Chief Tester",
-            email="testy@town.com",
-            phone="(555) 555 5555",
-        )
-        domain, _ = DraftDomain.objects.get_or_create(name="city.gov")
-        alt, _ = Website.objects.get_or_create(website="city1.gov")
-        current, _ = Website.objects.get_or_create(website="city.com")
-        you, _ = Contact.objects.get_or_create(
-            first_name="Testy you",
-            last_name="Tester you",
-            title="Admin Tester",
-            email="testy-admin@town.com",
-            phone="(555) 555 5556",
-        )
-        other, _ = Contact.objects.get_or_create(
-            first_name="Testy2",
-            last_name="Tester2",
-            title="Another Tester",
-            email="testy2@town.com",
-            phone="(555) 555 5557",
-        )
-        domain_application_kwargs = dict(
-            organization_type="federal",
-            federal_type="executive",
-            purpose="Purpose of the site",
-            is_policy_acknowledged=True,
-            organization_name="Testorg",
-            address_line1="address 1",
-            address_line2="address 2",
-            state_territory="NY",
-            zipcode="10002",
-            authorizing_official=ao,
-            requested_domain=domain,
-            submitter=you,
-            creator=user,
-        )
-        if has_type_of_work:
-            domain_application_kwargs["type_of_work"] = "e-Government"
-        if has_anything_else:
-            domain_application_kwargs["anything_else"] = "There is more"
-
-        application, _ = DomainApplication.objects.get_or_create(
-            **domain_application_kwargs
-        )
-
-        if has_other_contacts:
-            application.other_contacts.add(other)
-        if has_current_website:
-            application.current_websites.add(current)
-        if has_alternative_gov_domain:
-            application.alternative_domains.add(alt)
-
-        return application
-
     def setUp(self):
         self.mock_client_class = MagicMock()
         self.mock_client = self.mock_client_class.return_value
@@ -85,7 +17,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation(self):
         """Submission confirmation email works."""
-        application = self._completed_application()
+        application = completed_application()
 
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
@@ -122,7 +54,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_no_current_website_spacing(self):
         """Test line spacing without current_website."""
-        application = self._completed_application(has_current_website=False)
+        application = completed_application(has_current_website=False)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -134,7 +66,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_current_website_spacing(self):
         """Test line spacing with current_website."""
-        application = self._completed_application(has_current_website=True)
+        application = completed_application(has_current_website=True)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -147,7 +79,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_other_contacts_spacing(self):
         """Test line spacing with other contacts."""
-        application = self._completed_application(has_other_contacts=True)
+        application = completed_application(has_other_contacts=True)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -160,7 +92,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_no_other_contacts_spacing(self):
         """Test line spacing without other contacts."""
-        application = self._completed_application(has_other_contacts=False)
+        application = completed_application(has_other_contacts=False)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -172,7 +104,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_alternative_govdomain_spacing(self):
         """Test line spacing with alternative .gov domain."""
-        application = self._completed_application(has_alternative_gov_domain=True)
+        application = completed_application(has_alternative_gov_domain=True)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -184,7 +116,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_no_alternative_govdomain_spacing(self):
         """Test line spacing without alternative .gov domain."""
-        application = self._completed_application(has_alternative_gov_domain=False)
+        application = completed_application(has_alternative_gov_domain=False)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -196,7 +128,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_type_of_work_spacing(self):
         """Test line spacing with type of work."""
-        application = self._completed_application(has_type_of_work=True)
+        application = completed_application(has_type_of_work=True)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -208,7 +140,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_no_type_of_work_spacing(self):
         """Test line spacing without type of work."""
-        application = self._completed_application(has_type_of_work=False)
+        application = completed_application(has_type_of_work=False)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -220,7 +152,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_anything_else_spacing(self):
         """Test line spacing with anything else."""
-        application = self._completed_application(has_anything_else=True)
+        application = completed_application(has_anything_else=True)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
@@ -231,7 +163,7 @@ class TestEmails(TestCase):
     @boto3_mocking.patching
     def test_submission_confirmation_no_anything_else_spacing(self):
         """Test line spacing without anything else."""
-        application = self._completed_application(has_anything_else=False)
+        application = completed_application(has_anything_else=False)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args

src/registrar/tests/test_views.py

@@ -5,6 +5,7 @@ from django.conf import settings
 from django.test import Client, TestCase
 from django.urls import reverse
 from django.contrib.auth import get_user_model
+from .common import completed_application
 
 from django_webtest import WebTest  # type: ignore
 import boto3_mocking  # type: ignore
@@ -1370,85 +1371,18 @@ class TestApplicationStatus(TestWithUser, WebTest):
         self.app.set_user(self.user.username)
         self.client.force_login(self.user)
 
-    def _completed_application(
-        self,
-        has_other_contacts=True,
-        has_current_website=True,
-        has_alternative_gov_domain=True,
-        has_type_of_work=True,
-        has_anything_else=True,
-    ):
-        """A completed domain application."""
-        ao, _ = Contact.objects.get_or_create(
-            first_name="Testy",
-            last_name="Tester",
-            title="Chief Tester",
-            email="testy@town.com",
-            phone="(555) 555 5555",
-        )
-        domain, _ = DraftDomain.objects.get_or_create(name="citystatus.gov")
-        alt, _ = Website.objects.get_or_create(website="city1.gov")
-        current, _ = Website.objects.get_or_create(website="city.com")
-        you, _ = Contact.objects.get_or_create(
-            first_name="Testy you",
-            last_name="Tester you",
-            title="Admin Tester",
-            email="testy-admin@town.com",
-            phone="(555) 555 5556",
-        )
-        other, _ = Contact.objects.get_or_create(
-            first_name="Testy2",
-            last_name="Tester2",
-            title="Another Tester",
-            email="testy2@town.com",
-            phone="(555) 555 5557",
-        )
-        domain_application_kwargs = dict(
-            organization_type="federal",
-            federal_type="executive",
-            purpose="Purpose of the site",
-            is_policy_acknowledged=True,
-            organization_name="Testorg",
-            address_line1="address 1",
-            address_line2="address 2",
-            state_territory="NY",
-            zipcode="10002",
-            authorizing_official=ao,
-            requested_domain=domain,
-            submitter=you,
-            creator=self.user,
-        )
-        if has_type_of_work:
-            domain_application_kwargs["type_of_work"] = "e-Government"
-        if has_anything_else:
-            domain_application_kwargs["anything_else"] = "There is more"
-
-        application, _ = DomainApplication.objects.get_or_create(
-            **domain_application_kwargs
-        )
-
-        application.status = DomainApplication.SUBMITTED
-        application.save()
-
-        if has_other_contacts:
-            application.other_contacts.add(other)
-        if has_current_website:
-            application.current_websites.add(current)
-        if has_alternative_gov_domain:
-            application.alternative_domains.add(alt)
-
-        return application
-
     def test_application_status(self):
         """Checking application status page"""
-        application = self._completed_application()
+        application = completed_application(
+            status=DomainApplication.SUBMITTED, user=self.user
+        )
         application.save()
 
         home_page = self.app.get("/")
-        self.assertContains(home_page, "citystatus.gov")
+        self.assertContains(home_page, "city.gov")
         # click the "Manage" link
         detail_page = home_page.click("Manage")
-        self.assertContains(detail_page, "citystatus.gov")
+        self.assertContains(detail_page, "city.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
         self.assertContains(detail_page, "Admin Tester")
@@ -1456,14 +1390,16 @@ class TestApplicationStatus(TestWithUser, WebTest):
 
     def test_application_withdraw(self):
         """Checking application status page"""
-        application = self._completed_application()
+        application = completed_application(
+            status=DomainApplication.SUBMITTED, user=self.user
+        )
         application.save()
 
         home_page = self.app.get("/")
-        self.assertContains(home_page, "citystatus.gov")
+        self.assertContains(home_page, "city.gov")
         # click the "Manage" link
         detail_page = home_page.click("Manage")
-        self.assertContains(detail_page, "citystatus.gov")
+        self.assertContains(detail_page, "city.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
         self.assertContains(detail_page, "Admin Tester")
@@ -1485,7 +1421,9 @@ class TestApplicationStatus(TestWithUser, WebTest):
 
     def test_application_status_no_permissions(self):
         """Can't access applications without being the creator."""
-        application = self._completed_application()
+        application = completed_application(
+            status=DomainApplication.SUBMITTED, user=self.user
+        )
         other_user = User()
         other_user.save()
         application.creator = other_user