diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 4d4c2bc75..d2e4c31bc 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -42,6 +42,7 @@ from registrar.models.user_domain_role import UserDomainRole from registrar.models.utility.contact_error import ContactError, ContactErrorCodes from api.tests.common import less_console_noise_decorator + logger = logging.getLogger(__name__) @@ -802,7 +803,7 @@ class MockDbForSharedTests(MockDb): def setUpClass(cls): super().setUpClass() cls.sharedSetUp() - + @classmethod def tearDownClass(cls): super().tearDownClass() @@ -815,11 +816,10 @@ class MockDbForIndividualTests(MockDb): def setUp(self): super().setUp() self.sharedSetUp() - + def tearDown(self): super().tearDown() self.sharedTearDown() - def mock_user(): @@ -867,6 +867,7 @@ def create_user(): user.groups.set([group]) return user + def create_test_user(): username = "test_user" first_name = "First" @@ -879,6 +880,7 @@ def create_test_user(): ) return user + def create_ready_domain(): domain, _ = Domain.objects.get_or_create(name="city.gov", state=Domain.State.READY) return domain diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 1eece4fc4..b591f14f8 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -56,7 +56,7 @@ from .common import ( ) from django.contrib.sessions.backends.db import SessionStore from django.contrib.auth import get_user_model -from unittest.mock import ANY, patch, Mock +from unittest.mock import patch, Mock import logging @@ -109,7 +109,7 @@ class TestFsmModelResource(TestCase): class TestDomainRequestAdminForm(TestCase): - + def test_form_choices(self): with less_console_noise(): # Create a test domain request with an initial state of started @@ -197,7 +197,7 @@ class TestDomainInvitationAdmin(TestCase): def setUp(self): """Create a client object""" self.client = Client(HTTP_HOST="localhost:8080") - + def tearDown(self): """Delete all DomainInvitation objects""" DomainInvitation.objects.all().delete() @@ -361,7 +361,7 @@ class TestDomainInformationAdmin(TestCase): DomainRequest.objects.all().delete() Domain.objects.all().delete() Contact.objects.all().delete() - + @classmethod def tearDownClass(cls): User.objects.all().delete() @@ -737,7 +737,7 @@ class TestUserDomainRoleAdmin(TestCase): url="/admin/registrar/UserDomainRole/", model=UserDomainRole, ) - + def setUp(self): """Setup environment for a mock admin user""" super().setUp() @@ -748,7 +748,7 @@ class TestUserDomainRoleAdmin(TestCase): super().tearDown() Domain.objects.all().delete() UserDomainRole.objects.all().delete() - + @classmethod def tearDownClass(cls): super().tearDownClass() @@ -898,6 +898,7 @@ class TestUserDomainRoleAdmin(TestCase): fake_domain.delete() fake_user.delete() + class TestListHeaderAdmin(TestCase): """Tests for the ListHeaderAdmin class as super user @@ -913,7 +914,7 @@ class TestListHeaderAdmin(TestCase): cls.factory = RequestFactory() cls.admin = ListHeaderAdmin(model=DomainRequest, admin_site=None) cls.superuser = create_superuser() - + def setUp(self): super().setUp() self.client = Client(HTTP_HOST="localhost:8080") @@ -922,7 +923,7 @@ class TestListHeaderAdmin(TestCase): # delete any domain requests too DomainInformation.objects.all().delete() DomainRequest.objects.all().delete() - + @classmethod def tearDownClass(cls): super().tearDownClass() @@ -1010,7 +1011,7 @@ class TestMyUserAdmin(MockDbForSharedTests): def tearDown(self): super().tearDown() DomainRequest.objects.all().delete() - + @classmethod def tearDownClass(cls): super().tearDownClass() @@ -1205,6 +1206,7 @@ class TestMyUserAdmin(MockDbForSharedTests): domain_request_ineligible.delete() domain_deleted.delete() + class AuditedAdminTest(TestCase): @classmethod @@ -1212,7 +1214,7 @@ class AuditedAdminTest(TestCase): super().setUpClass() cls.site = AdminSite() cls.factory = RequestFactory() - + def setUp(self): super().setUp() self.client = Client(HTTP_HOST="localhost:8080") @@ -1223,7 +1225,7 @@ class AuditedAdminTest(TestCase): DomainInformation.objects.all().delete() DomainRequest.objects.all().delete() DomainInvitation.objects.all().delete() - + def order_by_desired_field_helper(self, obj_to_sort: AuditedAdmin, request, field_name, *obj_names): with less_console_noise(): formatted_sort_fields = [] @@ -1462,7 +1464,7 @@ class DomainSessionVariableTest(TestCase): cls.factory = RequestFactory() cls.admin = DomainAdmin(Domain, None) cls.superuser = create_superuser() - + def setUp(self): super().setUp() self.client = Client(HTTP_HOST="localhost:8080") @@ -1471,7 +1473,7 @@ class DomainSessionVariableTest(TestCase): def tearDownClass(cls): super().tearDownClass() User.objects.all().delete() - + def test_session_vars_set_correctly(self): """Checks if session variables are being set correctly""" @@ -1590,11 +1592,11 @@ class TestContactAdmin(TestCase): def setUpClass(cls): super().setUpClass() cls.site = AdminSite() - cls.factory = RequestFactory() + cls.factory = RequestFactory() cls.admin = ContactAdmin(model=get_user_model(), admin_site=None) cls.superuser = create_superuser() cls.staffuser = create_user() - + def setUp(self): super().setUp() self.client = Client(HTTP_HOST="localhost:8080") @@ -1608,7 +1610,7 @@ class TestContactAdmin(TestCase): def tearDownClass(cls): super().tearDownClass() User.objects.all().delete() - + @less_console_noise_decorator def test_has_model_description(self): """Tests if this model has a model description on the table view""" @@ -1684,7 +1686,7 @@ class TestContactAdmin(TestCase): f"domainrequest/{domain_request4.pk}/change/'>city4.gov" "", ) - + # cleanup this test DomainRequest.objects.all().delete() contact.delete() @@ -1868,7 +1870,7 @@ class TestDraftDomain(TestCase): def tearDown(self): super().tearDown() DraftDomain.objects.all().delete() - + @classmethod def tearDownClass(cls): super().tearDownClass() @@ -1903,14 +1905,14 @@ class TestFederalAgency(TestCase): cls.admin = FederalAgencyAdmin(model=FederalAgency, admin_site=cls.site) cls.factory = RequestFactory() cls.test_helper = GenericTestHelper(admin=cls.admin) - + def setUp(self): self.client = Client(HTTP_HOST="localhost:8080") def tearDown(self): super().tearDown() FederalAgency.objects.all().delete() - + @classmethod def tearDownClass(cls): super().tearDownClass() diff --git a/src/registrar/tests/test_admin_domain.py b/src/registrar/tests/test_admin_domain.py index bb0f17536..67a885438 100644 --- a/src/registrar/tests/test_admin_domain.py +++ b/src/registrar/tests/test_admin_domain.py @@ -9,7 +9,6 @@ from registrar.admin import ( DomainAdmin, ) from registrar.models import ( - Contact, Domain, DomainRequest, DomainInformation, @@ -37,7 +36,7 @@ logger = logging.getLogger(__name__) class TestDomainAdminAsStaff(MockEppLib): """Test DomainAdmin class as staff user. - + Notes: all tests share staffuser; do not change staffuser model in tests tests have available staffuser, client, and admin @@ -52,7 +51,7 @@ class TestDomainAdminAsStaff(MockEppLib): self.factory = RequestFactory() def setUp(self): - self.client = Client(HTTP_HOST="localhost:8080") + self.client = Client(HTTP_HOST="localhost:8080") self.client.force_login(self.staffuser) super().setUp() @@ -62,11 +61,11 @@ class TestDomainAdminAsStaff(MockEppLib): Domain.objects.all().delete() DomainInformation.objects.all().delete() DomainRequest.objects.all().delete() - + @classmethod def tearDownClass(self): User.objects.all().delete() - super().tearDownClass() + super().tearDownClass() @less_console_noise_decorator def test_staff_can_see_cisa_region_federal(self): @@ -374,7 +373,7 @@ class TestDomainAdminAsStaff(MockEppLib): class TestDomainAdminWClient(TestCase): """Test DomainAdmin class as super user. - + Notes: all tests share superuser; tests must not update superuser tests have available superuser, client, and admin @@ -389,7 +388,7 @@ class TestDomainAdminWClient(TestCase): self.superuser = create_superuser() def setUp(self): - self.client = Client(HTTP_HOST="localhost:8080") + self.client = Client(HTTP_HOST="localhost:8080") self.client.force_login(self.superuser) super().setUp() @@ -399,11 +398,11 @@ class TestDomainAdminWClient(TestCase): Domain.objects.all().delete() DomainInformation.objects.all().delete() DomainRequest.objects.all().delete() - + @classmethod def tearDownClass(self): User.objects.all().delete() - super().tearDownClass() + super().tearDownClass() @less_console_noise_decorator def test_has_model_description(self): @@ -665,7 +664,7 @@ class TestDomainAdminWClient(TestCase): class TestDomainAdminWebTest(MockEppLib, WebTest): """Test DomainAdmin class as super user, using WebTest. WebTest allows for easier handling of forms and html responses. - + Notes: all tests share superuser; tests must not update superuser tests have available superuser, app, and admin @@ -693,11 +692,11 @@ class TestDomainAdminWebTest(MockEppLib, WebTest): Domain.objects.all().delete() DomainInformation.objects.all().delete() DomainRequest.objects.all().delete() - + @classmethod def tearDownClass(self): User.objects.all().delete() - super().tearDownClass() + super().tearDownClass() @less_console_noise_decorator @patch("registrar.admin.DomainAdmin._get_current_date", return_value=date(2024, 1, 1)) @@ -866,4 +865,3 @@ class TestDomainAdminWebTest(MockEppLib, WebTest): @skip("Waiting on epp lib to implement") def test_place_and_remove_hold_epp(self): raise - diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py index d02b99c22..6c8935825 100644 --- a/src/registrar/tests/test_admin_request.py +++ b/src/registrar/tests/test_admin_request.py @@ -31,7 +31,7 @@ from .common import ( MockEppLib, GenericTestHelper, ) -from unittest.mock import ANY, patch +from unittest.mock import patch from django.conf import settings import boto3_mocking # type: ignore @@ -43,7 +43,7 @@ logger = logging.getLogger(__name__) @boto3_mocking.patching class TestDomainRequestAdmin(MockEppLib): """Test DomainRequestAdmin class as either staff or super user. - + Notes: all tests share superuser/staffuser; do not change these models in tests tests have available staffuser, superuser, client, admin and test_helper @@ -878,9 +878,7 @@ class TestDomainRequestAdmin(MockEppLib): DomainRequest.DomainRequestStatus.REJECTED, DomainRequest.RejectionReasons.SECOND_DOMAIN_REASONING, ) - self.assert_email_is_accurate( - "Your domain request was rejected because Testorg has a .gov domain.", 0, EMAIL - ) + self.assert_email_is_accurate("Your domain request was rejected because Testorg has a .gov domain.", 0, EMAIL) self.assertEqual(len(self.mock_client.EMAILS_SENT), 1) # Approve @@ -1226,7 +1224,7 @@ class TestDomainRequestAdmin(MockEppLib): last_name="Jones", email="meoward.jones@igorville.gov", phone="(555) 123 12345", - title = "Treat inspector" + title="Treat inspector", ) # Create a fake domain request @@ -1306,9 +1304,7 @@ class TestDomainRequestAdmin(MockEppLib): domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW) # Create a mock request - request = self.factory.post( - "/admin/registrar/domainrequest/{}/change/".format(domain_request.pk), follow=True - ) + request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk), follow=True) with boto3_mocking.clients.handler_for("sesv2", self.mock_client): # Modify the domain request's property @@ -1350,9 +1346,7 @@ class TestDomainRequestAdmin(MockEppLib): self.assertContains(response, "Yes, select ineligible status") # Create a mock request - request = self.factory.post( - "/admin/registrar/domainrequest{}/change/".format(domain_request.pk), follow=True - ) + request = self.factory.post("/admin/registrar/domainrequest{}/change/".format(domain_request.pk), follow=True) with boto3_mocking.clients.handler_for("sesv2", self.mock_client): # Modify the domain request's property domain_request.status = DomainRequest.DomainRequestStatus.INELIGIBLE @@ -1873,5 +1867,3 @@ class TestDomainRequestAdmin(MockEppLib): # Check if response contains expected_html self.assertIn(expected_html, response_content) - - diff --git a/src/registrar/tests/test_emails.py b/src/registrar/tests/test_emails.py index 1a1556720..8cf707004 100644 --- a/src/registrar/tests/test_emails.py +++ b/src/registrar/tests/test_emails.py @@ -6,7 +6,7 @@ from django.test import TestCase from waffle.testutils import override_flag from registrar.utility import email from registrar.utility.email import send_templated_email -from .common import completed_domain_request, less_console_noise +from .common import completed_domain_request from api.tests.common import less_console_noise_decorator from datetime import datetime diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py index a47e9a2a2..cfec24454 100644 --- a/src/registrar/tests/test_models.py +++ b/src/registrar/tests/test_models.py @@ -2,7 +2,6 @@ from django.test import TestCase from django.db.utils import IntegrityError from django.db import transaction from unittest.mock import patch -from django.contrib.auth import get_user_model from django.test import RequestFactory @@ -24,12 +23,19 @@ from registrar.models.transition_domain import TransitionDomain from registrar.models.verified_by_staff import VerifiedByStaff # type: ignore from registrar.utility.constants import BranchChoices -from .common import MockSESClient, less_console_noise, completed_domain_request, set_domain_request_investigators, create_test_user +from .common import ( + MockSESClient, + less_console_noise, + completed_domain_request, + set_domain_request_investigators, + create_test_user, +) from django_fsm import TransitionNotAllowed from waffle.testutils import override_flag from api.tests.common import less_console_noise_decorator + @boto3_mocking.patching class TestDomainRequest(TestCase): @less_console_noise_decorator diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index 11bb676f3..e3f13d85f 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -31,8 +31,7 @@ from .common import MockDbForSharedTests, MockDbForIndividualTests, MockEppLib, class CsvReportsTest(MockDbForSharedTests): - """Tests to determine if we are uploading our reports correctly. - """ + """Tests to determine if we are uploading our reports correctly.""" def setUp(self): """setup fake comain data""" @@ -200,8 +199,7 @@ class CsvReportsTest(MockDbForSharedTests): class ExportDataTest(MockDbForIndividualTests, MockEppLib): - """Test the ExportData class from csv_export. - """ + """Test the ExportData class from csv_export.""" @less_console_noise_decorator def test_domain_data_type(self): diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index c8d62ee8c..37b939147 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -121,9 +121,7 @@ class TestEnvironmentVariablesEffects(TestCase): fake_domain, _ = Domain.objects.get_or_create(name="igorville.gov") # Add a role - UserDomainRole.objects.get_or_create( - user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER - ) + UserDomainRole.objects.get_or_create(user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER) with patch.object(DomainNameserversView, "get_initial", side_effect=self.side_effect_raise_value_error): with self.assertRaises(ValueError): @@ -144,9 +142,7 @@ class TestEnvironmentVariablesEffects(TestCase): fake_domain, _ = Domain.objects.get_or_create(name="igorville.gov") # Add a role - UserDomainRole.objects.get_or_create( - user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER - ) + UserDomainRole.objects.get_or_create(user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER) with patch.object(DomainNameserversView, "get_initial", side_effect=self.side_effect_raise_value_error): with self.assertRaises(ValueError): @@ -228,7 +224,9 @@ class HomeTests(TestWithUser): test_domain.expiration_date = date(2011, 10, 10) test_domain.save() - test_role, _ = UserDomainRole.objects.get_or_create(user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER) + test_role, _ = UserDomainRole.objects.get_or_create( + user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER + ) # Grab the json response of the domains list response = self.client.get("/get-domains-json/") @@ -995,7 +993,9 @@ class PortfoliosTests(TestWithUser, WebTest): user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER ) self.federal_agency = FederalAgency.objects.create() - self.portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="xyz inc", federal_agency=self.federal_agency) + self.portfolio, _ = Portfolio.objects.get_or_create( + creator=self.user, organization_name="xyz inc", federal_agency=self.federal_agency + ) def tearDown(self): Portfolio.objects.all().delete()