merge main

src/registrar/tests/test_views_portfolio.py

@@ -10,7 +10,8 @@ from registrar.models import (
     UserDomainRole,
     User,
 )
-from .test_views import TestWithUser
+from registrar.tests.test_views import TestWithUser
+from .common import create_test_user
 from waffle.testutils import override_flag
 
 import logging
@@ -18,15 +19,25 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class TestPortfolio(TestWithUser, WebTest):
+class TestPortfolio(WebTest):
     def setUp(self):
         super().setUp()
+        self.user = create_test_user()
         self.domain, _ = Domain.objects.get_or_create(name="igorville.gov")
         self.portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
         self.role, _ = UserDomainRole.objects.get_or_create(
             user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER
         )
 
+    def tearDown(self):
+        Portfolio.objects.all().delete()
+        UserDomainRole.objects.all().delete()
+        DomainRequest.objects.all().delete()
+        DomainInformation.objects.all().delete()
+        Domain.objects.all().delete()
+        User.objects.all().delete()
+        super().tearDown()
+
     @less_console_noise_decorator
     def test_middleware_does_not_redirect_if_no_permission(self):
         """Test that user with no portfolio permission is not redirected when attempting to access home"""
@@ -184,14 +195,6 @@ class TestPortfolio(TestWithUser, WebTest):
                 portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
             )
 
-    def tearDown(self):
-        Portfolio.objects.all().delete()
-        UserDomainRole.objects.all().delete()
-        DomainRequest.objects.all().delete()
-        DomainInformation.objects.all().delete()
-        Domain.objects.all().delete()
-        super().tearDown()
-
 
 class TestPortfolioOrganization(TestPortfolio):