From b5464a9da8c865fc085e3575a8874f58e25f91a1 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:12:00 -0700 Subject: [PATCH] lintomatic --- src/registrar/forms/portfolio.py | 5 +-- src/registrar/tests/test_views_portfolio.py | 40 +++++++++------------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py index 85c0faf62..d0dbb0b8f 100644 --- a/src/registrar/forms/portfolio.py +++ b/src/registrar/forms/portfolio.py @@ -150,7 +150,6 @@ class BasePortfolioMemberForm(forms.Form): ) domain_request_permission_member = forms.ChoiceField( - # nosec B308 - required_star is a hardcoded HTML string label=mark_safe(f"Select permission {required_star}"), # nosec choices=[ (UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value, "View all requests"), @@ -276,7 +275,9 @@ class BasePortfolioMemberForm(forms.Form): "role": role, "member_permission_admin": getattr(member_permission, "value", None) if is_admin else None, "domain_request_permission_admin": getattr(domain_request_permission, "value", None) if is_admin else None, - "domain_request_permission_member": getattr(domain_request_permission, "value", None) if not is_admin else None, + "domain_request_permission_member": ( + getattr(domain_request_permission, "value", None) if not is_admin else None + ), } # Edgecase: Member uses a special form value for None called "no_access". This ensures a form selection. diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 664d50e87..30091c593 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -2685,14 +2685,14 @@ class TestEditPortfolioMemberView(WebTest): def test_edit_member_permissions_basic_to_admin(self): """Tests converting a basic member to admin with full permissions.""" self.client.force_login(self.user) - + # Create a basic member to edit basic_member = create_test_user() basic_permission = UserPortfolioPermission.objects.create( user=basic_member, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER], - additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS] + additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS], ) response = self.client.post( @@ -2701,12 +2701,12 @@ class TestEditPortfolioMemberView(WebTest): "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, "domain_request_permission_admin": UserPortfolioPermissionChoices.EDIT_REQUESTS, "member_permission_admin": UserPortfolioPermissionChoices.EDIT_MEMBERS, - } + }, ) # Verify redirect and success message self.assertEqual(response.status_code, 302) - + # Verify database changes basic_permission.refresh_from_db() self.assertEqual(basic_permission.roles, [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]) @@ -2718,7 +2718,7 @@ class TestEditPortfolioMemberView(WebTest): UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS, UserPortfolioPermissionChoices.EDIT_MEMBERS, UserPortfolioPermissionChoices.VIEW_MEMBERS, - } + }, ) @less_console_noise_decorator @@ -2727,12 +2727,10 @@ class TestEditPortfolioMemberView(WebTest): def test_edit_member_permissions_validation(self): """Tests form validation for required fields based on role.""" self.client.force_login(self.user) - + member = create_test_user() permission = UserPortfolioPermission.objects.create( - user=member, - portfolio=self.portfolio, - roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER] + user=member, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER] ) # Test missing required admin permissions @@ -2741,17 +2739,16 @@ class TestEditPortfolioMemberView(WebTest): { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, # Missing required admin fields - } + }, ) self.assertEqual(response.status_code, 200) self.assertEqual( response.context["form"].errors["domain_request_permission_admin"][0], - "Admin domain request permission is required" + "Admin domain request permission is required", ) self.assertEqual( - response.context["form"].errors["member_permission_admin"][0], - "Admin member permission is required" + response.context["form"].errors["member_permission_admin"][0], "Admin member permission is required" ) @less_console_noise_decorator @@ -2760,7 +2757,7 @@ class TestEditPortfolioMemberView(WebTest): def test_edit_invited_member_permissions(self): """Tests editing permissions for an invited (but not yet joined) member.""" self.client.force_login(self.user) - + # Test updating invitation permissions response = self.client.post( reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}), @@ -2768,11 +2765,11 @@ class TestEditPortfolioMemberView(WebTest): "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, "domain_request_permission_admin": UserPortfolioPermissionChoices.EDIT_REQUESTS, "member_permission_admin": UserPortfolioPermissionChoices.EDIT_MEMBERS, - } + }, ) self.assertEqual(response.status_code, 302) - + # Verify invitation was updated self.invitation.refresh_from_db() self.assertEqual(self.invitation.roles, [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]) @@ -2783,7 +2780,7 @@ class TestEditPortfolioMemberView(WebTest): UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS, UserPortfolioPermissionChoices.EDIT_MEMBERS, UserPortfolioPermissionChoices.VIEW_MEMBERS, - } + }, ) @less_console_noise_decorator @@ -2792,19 +2789,16 @@ class TestEditPortfolioMemberView(WebTest): def test_admin_removing_own_admin_role(self): """Tests an admin removing their own admin role redirects to home.""" self.client.force_login(self.user) - + # Get the user's admin permission - admin_permission = UserPortfolioPermission.objects.get( - user=self.user, - portfolio=self.portfolio - ) + admin_permission = UserPortfolioPermission.objects.get(user=self.user, portfolio=self.portfolio) response = self.client.post( reverse("member-permissions", kwargs={"pk": admin_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_request_permission_member": UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS, - } + }, ) self.assertEqual(response.status_code, 302)