From 0f0ce6be53d488568e6b2070127791de55777016 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:54:03 -0600
Subject: [PATCH] Additional merge conflicts

---
 src/registrar/models/domain_request.py | 2 +-
 src/registrar/tests/common.py          | 2 +-
 src/registrar/tests/test_models.py     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 4f7e79c39..2282af726 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -777,7 +777,7 @@ class DomainRequest(TimeStampedModel):
         conditions=[investigator_exists_and_is_staff],
     )
     def approve(self, send_email=True):
-        """Approve an domain_request that has been submitted.
+        """Approve an domain request that has been submitted.
 
         This action cleans up the rejection status if moving away from rejected.
 
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index 587935d54..f5ba815f4 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -600,7 +600,7 @@ def completed_domain_request(
     return domain_request
 
 def set_domain_request_investigators(domain_request_list: list[DomainRequest], investigator_user: User):
-    """Helper method that sets the investigator field of all provided domain_requests"""
+    """Helper method that sets the investigator field of all provided domain requests"""
     for request in domain_request_list:
         request.investigator = investigator_user
         request.save()
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 7956b5dc0..de6d021d9 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -245,11 +245,11 @@ class TestDomainRequest(TestCase):
     def assert_fsm_transition_does_not_raise_error(self, test_cases, method_to_run):
         """Given a list of test cases, ensure that none of them throw transition errors"""
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
-            for application, exception_type in test_cases:
-                with self.subTest(application=application, exception_type=exception_type):
+            for domain_request, exception_type in test_cases:
+                with self.subTest(domain_request=domain_request, exception_type=exception_type):
                     try:
                         # Retrieve the method by name from the application object and call it
-                        method = getattr(application, method_to_run)
+                        method = getattr(domain_request, method_to_run)
                         # Call the method
                         method()
                     except exception_type:
@@ -920,7 +920,7 @@ class TestDomainInformation(TestCase):
         self.maxDiff = None
         draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
         user, _ = User.objects.get_or_create()
-        domain_request = DomainApplication.objects.create(creator=user, requested_domain=draft_domain, notes="test notes")
+        domain_request = DomainRequest.objects.create(creator=user, requested_domain=draft_domain, notes="test notes")
 
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
             with less_console_noise():