From f4c48b55b4c0bccab10f79001e1e6ed769dfd29d Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:55:14 -0700 Subject: [PATCH] lint and fix tests --- src/registrar/forms/portfolio.py | 2 +- src/registrar/models/utility/portfolio_helper.py | 8 ++++---- src/registrar/tests/test_views_portfolio.py | 12 ++---------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py index ff2431d03..05f708b5b 100644 --- a/src/registrar/forms/portfolio.py +++ b/src/registrar/forms/portfolio.py @@ -445,7 +445,7 @@ class PortfolioNewMemberForm(BasePortfolioMemberForm): class Meta: model = PortfolioInvitation fields = ["portfolio", "email", "roles", "additional_permissions"] - + def _post_clean(self): """ Override _post_clean to customize model validation errors. diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py index 67b0b8259..48acbf999 100644 --- a/src/registrar/models/utility/portfolio_helper.py +++ b/src/registrar/models/utility/portfolio_helper.py @@ -286,7 +286,7 @@ def validate_user_portfolio_permission(user_portfolio_permission): raise ValidationError( "This user is already assigned to a portfolio. " "Based on current waffle flag settings, users cannot be assigned to multiple portfolios.", - code="has_existing_permissions" + code="has_existing_permissions", ) existing_invitations = PortfolioInvitation.objects.filter(email=user_portfolio_permission.user.email).exclude( @@ -297,7 +297,7 @@ def validate_user_portfolio_permission(user_portfolio_permission): raise ValidationError( "This user is already assigned to a portfolio invitation. " "Based on current waffle flag settings, users cannot be assigned to multiple portfolios.", - code="has_existing_invitations" + code="has_existing_invitations", ) @@ -359,14 +359,14 @@ def validate_portfolio_invitation(portfolio_invitation): raise ValidationError( "This user is already assigned to a portfolio. " "Based on current waffle flag settings, users cannot be assigned to multiple portfolios.", - code="has_existing_permissions" + code="has_existing_permissions", ) if existing_invitations.exists(): raise ValidationError( "This user is already assigned to a portfolio invitation. " "Based on current waffle flag settings, users cannot be assigned to multiple portfolios.", - code="has_existing_invitations" + code="has_existing_invitations", ) diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 64bcb50a8..635c77ef9 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -3873,11 +3873,7 @@ class TestPortfolioInviteNewMemberView(MockEppLib, WebTest): # verify messages self.assertContains( response, - ( - "This user is already assigned to a portfolio invitation. " - "Based on current waffle flag settings, users cannot be assigned " - "to multiple portfolios." - ), + ("This user has already been invited to another .gov organization."), ) # Validate Database has not changed @@ -3915,11 +3911,7 @@ class TestPortfolioInviteNewMemberView(MockEppLib, WebTest): # Verify messages self.assertContains( response, - ( - "This user is already assigned to a portfolio. " - "Based on current waffle flag settings, users cannot be " - "assigned to multiple portfolios." - ), + ("This user is already a member of another .gov organization."), ) # Validate Database has not changed