diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 93942e438..25d7e5fd2 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -2122,6 +2122,94 @@ class TestPortfolioAdmin(TestCase):
domain_requests = self.admin.domain_requests(self.portfolio)
self.assertIn("2 domain requests", domain_requests)
+ @less_console_noise_decorator
+ def test_portfolio_members_display(self):
+ """Tests the custom portfolio members field, admin and member sections"""
+ admin_user_1 = User.objects.create(
+ username="testuser1",
+ first_name="Gerald",
+ last_name="Meoward",
+ title="Captain",
+ email="meaoward@gov.gov",
+ )
+
+ UserPortfolioPermission.objects.all().create(
+ user=admin_user_1, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+ )
+
+ admin_user_2 = User.objects.create(
+ username="testuser2",
+ first_name="Arnold",
+ last_name="Poopy",
+ title="Major",
+ email="poopy@gov.gov",
+ )
+
+ UserPortfolioPermission.objects.all().create(
+ user=admin_user_2, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+ )
+
+ admin_user_3 = User.objects.create(
+ username="testuser3",
+ first_name="Mad",
+ last_name="Max",
+ title="Road warrior",
+ email="madmax@gov.gov",
+ )
+
+ UserPortfolioPermission.objects.all().create(
+ user=admin_user_3, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
+ )
+
+ admin_user_4 = User.objects.create(
+ username="testuser4",
+ first_name="Agent",
+ last_name="Smith",
+ title="Program",
+ email="thematrix@gov.gov",
+ )
+
+ UserPortfolioPermission.objects.all().create(
+ user=admin_user_4,
+ portfolio=self.portfolio,
+ additional_permissions=[
+ UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+ UserPortfolioPermissionChoices.EDIT_REQUESTS,
+ ],
+ )
+
+ display_admins = self.admin.display_admins(self.portfolio)
+
+ self.assertIn(
+ f'Gerald Meoward meaoward@gov.gov',
+ display_admins,
+ )
+ self.assertIn("Captain", display_admins)
+ 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)
+
+ self.assertIn(
+ f'Mad Max madmax@gov.gov',
+ display_members_summary,
+ )
+ self.assertIn(
+ f'Agent Smith thematrix@gov.gov',
+ display_members_summary,
+ )
+
+ display_members = self.admin.display_members(self.portfolio)
+
+ self.assertIn("Mad Max", display_members)
+ self.assertIn("Member", display_members)
+ self.assertIn("Road warrior", display_members)
+ self.assertIn("Agent Smith", display_members)
+ self.assertIn("Domain requestor", display_members)
+ self.assertIn("Program", display_members)
+
class TestTransferUser(WebTest):
"""User transfer custom admin page"""
@@ -2340,90 +2428,3 @@ class TestTransferUser(WebTest):
"""Assert modal on page"""
user_transfer_page = self.app.get(reverse("transfer_user", args=[self.user1.pk]))
self.assertContains(user_transfer_page, "This action cannot be undone.")
- @less_console_noise_decorator
- def test_portfolio_members_display(self):
- """Tests the custom portfolio members field, admin and member sections"""
- admin_user_1 = User.objects.create(
- username="testuser1",
- first_name="Gerald",
- last_name="Meoward",
- title="Captain",
- email="meaoward@gov.gov",
- )
-
- UserPortfolioPermission.objects.all().create(
- user=admin_user_1, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
- )
-
- admin_user_2 = User.objects.create(
- username="testuser2",
- first_name="Arnold",
- last_name="Poopy",
- title="Major",
- email="poopy@gov.gov",
- )
-
- UserPortfolioPermission.objects.all().create(
- user=admin_user_2, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
- )
-
- admin_user_3 = User.objects.create(
- username="testuser3",
- first_name="Mad",
- last_name="Max",
- title="Road warrior",
- email="madmax@gov.gov",
- )
-
- UserPortfolioPermission.objects.all().create(
- user=admin_user_3, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
- )
-
- admin_user_4 = User.objects.create(
- username="testuser4",
- first_name="Agent",
- last_name="Smith",
- title="Program",
- email="thematrix@gov.gov",
- )
-
- UserPortfolioPermission.objects.all().create(
- user=admin_user_4,
- portfolio=self.portfolio,
- additional_permissions=[
- UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
- UserPortfolioPermissionChoices.EDIT_REQUESTS,
- ],
- )
-
- display_admins = self.admin.display_admins(self.portfolio)
-
- self.assertIn(
- f'Gerald Meoward meaoward@gov.gov',
- display_admins,
- )
- self.assertIn("Captain", display_admins)
- 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)
-
- self.assertIn(
- f'Mad Max madmax@gov.gov',
- display_members_summary,
- )
- self.assertIn(
- f'Agent Smith thematrix@gov.gov',
- display_members_summary,
- )
-
- display_members = self.admin.display_members(self.portfolio)
-
- self.assertIn("Mad Max", display_members)
- self.assertIn("Member", display_members)
- self.assertIn("Road warrior", display_members)
- self.assertIn("Agent Smith", display_members)
- self.assertIn("Domain requestor", display_members)
- self.assertIn("Program", display_members)