From d8227148f61e5d92bbdbe30ddd4b35cfe9c0dff4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:20:53 -0600 Subject: [PATCH] Fix tests and lint --- src/registrar/models/portfolio.py | 1 - .../models/user_portfolio_permission.py | 6 ++++-- src/registrar/models/utility/portfolio_helper.py | 2 +- src/registrar/tests/test_admin.py | 16 ++++++++++------ src/registrar/tests/test_migrations.py | 7 +++++++ 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/registrar/models/portfolio.py b/src/registrar/models/portfolio.py index 7a2a4b5b7..0a60d3ec8 100644 --- a/src/registrar/models/portfolio.py +++ b/src/registrar/models/portfolio.py @@ -137,7 +137,6 @@ class Portfolio(TimeStampedModel): super().save(*args, **kwargs) - @property def portfolio_type(self): """ diff --git a/src/registrar/models/user_portfolio_permission.py b/src/registrar/models/user_portfolio_permission.py index 29e900ab6..a55c04e5c 100644 --- a/src/registrar/models/user_portfolio_permission.py +++ b/src/registrar/models/user_portfolio_permission.py @@ -77,7 +77,9 @@ class UserPortfolioPermission(TimeStampedModel): def __str__(self): readable_roles = [] if self.roles: - readable_roles = sorted([UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in self.roles]) + readable_roles = sorted( + [UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in self.roles] + ) return f"{self.user}' " f"" if self.roles else "" def get_readable_roles(self): @@ -86,7 +88,7 @@ class UserPortfolioPermission(TimeStampedModel): for role in self.roles: role_labels.append(UserPortfolioRoleChoices.get_user_portfolio_role_label(role)) return role_labels - + def get_readable_additional_permissions(self): """Returns a list of labels of each additional_permission in self.additional_permissions""" perm_labels = [] diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py index 24800fd19..ef9336f18 100644 --- a/src/registrar/models/utility/portfolio_helper.py +++ b/src/registrar/models/utility/portfolio_helper.py @@ -36,4 +36,4 @@ class UserPortfolioPermissionChoices(models.TextChoices): @classmethod def get_user_portfolio_permission_label(cls, user_portfolio_permission): - return cls(user_portfolio_permission).label if user_portfolio_permission else None \ No newline at end of file + return cls(user_portfolio_permission).label if user_portfolio_permission else None diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index fd55e83f1..daf5e7086 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -2098,24 +2098,28 @@ class TestPortfolioAdmin(TestCase): display_admins = self.admin.display_admins(self.portfolio) + url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_1.pk]) self.assertIn( - f'Gerald Meoward meaoward@gov.gov', + f'Gerald Meoward meaoward@gov.gov', display_admins, ) self.assertIn("Captain", display_admins) - self.assertIn( - f'Arnold Poopy poopy@gov.gov', display_admins - ) + + url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_2.pk]) + self.assertIn(f'Arnold Poopy poopy@gov.gov', display_admins) self.assertIn("Major", display_admins) display_members_summary = self.admin.display_members_summary(self.portfolio) + url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_3.pk]) self.assertIn( - f'Mad Max madmax@gov.gov', + f'Mad Max madmax@gov.gov', display_members_summary, ) + + url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_4.pk]) self.assertIn( - f'Agent Smith thematrix@gov.gov', + f'Agent Smith thematrix@gov.gov', display_members_summary, ) diff --git a/src/registrar/tests/test_migrations.py b/src/registrar/tests/test_migrations.py index 6d8ff7151..5dde4831c 100644 --- a/src/registrar/tests/test_migrations.py +++ b/src/registrar/tests/test_migrations.py @@ -40,10 +40,17 @@ class TestGroups(TestCase): "add_federalagency", "change_federalagency", "delete_federalagency", + "add_portfolio", + "change_portfolio", + "delete_portfolio", + "add_suborganization", + "change_suborganization", + "delete_suborganization", "analyst_access_permission", "change_user", "delete_userdomainrole", "view_userdomainrole", + "view_userportfoliopermission", "add_verifiedbystaff", "change_verifiedbystaff", "delete_verifiedbystaff",