diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index e57688228..2c7a3376c 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -1048,6 +1048,7 @@ class TestPortfolio(WebTest): portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], additional_permissions=[ + UserPortfolioPermissionChoices.EDIT_REQUESTS, UserPortfolioPermissionChoices.EDIT_MEMBERS, ], ) @@ -1056,6 +1057,7 @@ class TestPortfolio(WebTest): portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], additional_permissions=[ + UserPortfolioPermissionChoices.EDIT_REQUESTS, UserPortfolioPermissionChoices.EDIT_MEMBERS, ], ) @@ -1133,10 +1135,10 @@ class TestPortfolio(WebTest): """Test the nav contains a dropdown with a link to create and another link to view requests Also test for the existence of the Create a new request btn on the requests page""" UserPortfolioPermission.objects.get_or_create( - user=self.user, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], - additional_permissions=[ - UserPortfolioPermissionChoices.EDIT_REQUESTS - ] + user=self.user, + portfolio=self.portfolio, + roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], + additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS], ) self.client.force_login(self.user) # create and submit a domain request @@ -2123,7 +2125,10 @@ class TestRequestingEntity(WebTest): portfolio=self.portfolio_2, ) self.portfolio_role = UserPortfolioPermission.objects.create( - portfolio=self.portfolio, user=self.user, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN] + portfolio=self.portfolio, + user=self.user, + roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], + additional_permissions=[UserPortfolioPermissionChoices.EDIT_MEMBERS], ) # Login the current user self.app.set_user(self.user.username) diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py index 32cdda06a..a61b12e74 100644 --- a/src/registrar/tests/test_views_request.py +++ b/src/registrar/tests/test_views_request.py @@ -26,7 +26,7 @@ from registrar.views.domain_request import DomainRequestWizard, Step from .common import less_console_noise from .test_views import TestWithUser -from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices +from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices, UserPortfolioPermissionChoices import logging logger = logging.getLogger(__name__) @@ -47,10 +47,12 @@ class DomainRequestTests(TestWithUser, WebTest): def tearDown(self): super().tearDown() - DomainRequest.objects.all().delete() + Domain.objects.all().delete() DomainInformation.objects.all().delete() + DomainRequest.objects.all().delete() + UserPortfolioPermission.objects.all().delete() + Portfolio.objects.all().delete() User.objects.all().delete() - self.federal_agency.delete() @less_console_noise_decorator def test_domain_request_form_intro_acknowledgement(self): @@ -2753,7 +2755,10 @@ class DomainRequestTests(TestWithUser, WebTest): """Tests that a portfolio user with edit request permissions can edit and add new requests""" portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Test Portfolio") portfolio_perm, _ = UserPortfolioPermission.objects.get_or_create( - user=self.user, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN] + user=self.user, + portfolio=portfolio, + roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], + additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS], ) # This user should be allowed to create new domain requests @@ -2765,11 +2770,6 @@ class DomainRequestTests(TestWithUser, WebTest): edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk})).follow() self.assertEqual(edit_page.status_code, 200) - # Cleanup - DomainRequest.objects.all().delete() - portfolio_perm.delete() - portfolio.delete() - def test_non_creator_access(self): """Tests that a user cannot edit a domain request they didn't create""" p = "password" @@ -2863,7 +2863,10 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest): """Tests that the withdraw button on portfolio redirects to the portfolio domain requests page""" portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Test Portfolio") UserPortfolioPermission.objects.get_or_create( - user=self.user, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN] + user=self.user, + portfolio=portfolio, + roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN], + additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS], ) domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.SUBMITTED, user=self.user) domain_request.save()