mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-14 16:47:02 +02:00
merge cleanup
This commit is contained in:
parent
73e3ced96a
commit
db593fcb6e
1 changed files with 88 additions and 87 deletions
|
@ -2122,6 +2122,94 @@ class TestPortfolioAdmin(TestCase):
|
||||||
domain_requests = self.admin.domain_requests(self.portfolio)
|
domain_requests = self.admin.domain_requests(self.portfolio)
|
||||||
self.assertIn("2 domain requests", domain_requests)
|
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'<a href="/admin/registrar/user/{admin_user_1.pk}/change/">Gerald Meoward meaoward@gov.gov</a>',
|
||||||
|
display_admins,
|
||||||
|
)
|
||||||
|
self.assertIn("Captain", display_admins)
|
||||||
|
self.assertIn(
|
||||||
|
f'<a href="/admin/registrar/user/{admin_user_2.pk}/change/">Arnold Poopy poopy@gov.gov</a>', display_admins
|
||||||
|
)
|
||||||
|
self.assertIn("Major", display_admins)
|
||||||
|
|
||||||
|
display_members_summary = self.admin.display_members_summary(self.portfolio)
|
||||||
|
|
||||||
|
self.assertIn(
|
||||||
|
f'<a href="/admin/registrar/user/{admin_user_3.pk}/change/">Mad Max madmax@gov.gov</a>',
|
||||||
|
display_members_summary,
|
||||||
|
)
|
||||||
|
self.assertIn(
|
||||||
|
f'<a href="/admin/registrar/user/{admin_user_4.pk}/change/">Agent Smith thematrix@gov.gov</a>',
|
||||||
|
display_members_summary,
|
||||||
|
)
|
||||||
|
|
||||||
|
display_members = self.admin.display_members(self.portfolio)
|
||||||
|
|
||||||
|
self.assertIn("Mad Max", display_members)
|
||||||
|
self.assertIn("<span class='usa-tag'>Member</span>", display_members)
|
||||||
|
self.assertIn("Road warrior", display_members)
|
||||||
|
self.assertIn("Agent Smith", display_members)
|
||||||
|
self.assertIn("<span class='usa-tag'>Domain requestor</span>", display_members)
|
||||||
|
self.assertIn("Program", display_members)
|
||||||
|
|
||||||
|
|
||||||
class TestTransferUser(WebTest):
|
class TestTransferUser(WebTest):
|
||||||
"""User transfer custom admin page"""
|
"""User transfer custom admin page"""
|
||||||
|
@ -2340,90 +2428,3 @@ class TestTransferUser(WebTest):
|
||||||
"""Assert modal on page"""
|
"""Assert modal on page"""
|
||||||
user_transfer_page = self.app.get(reverse("transfer_user", args=[self.user1.pk]))
|
user_transfer_page = self.app.get(reverse("transfer_user", args=[self.user1.pk]))
|
||||||
self.assertContains(user_transfer_page, "This action cannot be undone.")
|
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'<a href="/admin/registrar/user/{admin_user_1.pk}/change/">Gerald Meoward meaoward@gov.gov</a>',
|
|
||||||
display_admins,
|
|
||||||
)
|
|
||||||
self.assertIn("Captain", display_admins)
|
|
||||||
self.assertIn(
|
|
||||||
f'<a href="/admin/registrar/user/{admin_user_2.pk}/change/">Arnold Poopy poopy@gov.gov</a>', display_admins
|
|
||||||
)
|
|
||||||
self.assertIn("Major", display_admins)
|
|
||||||
|
|
||||||
display_members_summary = self.admin.display_members_summary(self.portfolio)
|
|
||||||
|
|
||||||
self.assertIn(
|
|
||||||
f'<a href="/admin/registrar/user/{admin_user_3.pk}/change/">Mad Max madmax@gov.gov</a>',
|
|
||||||
display_members_summary,
|
|
||||||
)
|
|
||||||
self.assertIn(
|
|
||||||
f'<a href="/admin/registrar/user/{admin_user_4.pk}/change/">Agent Smith thematrix@gov.gov</a>',
|
|
||||||
display_members_summary,
|
|
||||||
)
|
|
||||||
|
|
||||||
display_members = self.admin.display_members(self.portfolio)
|
|
||||||
|
|
||||||
self.assertIn("Mad Max", display_members)
|
|
||||||
self.assertIn("<span class='usa-tag'>Member</span>", display_members)
|
|
||||||
self.assertIn("Road warrior", display_members)
|
|
||||||
self.assertIn("Agent Smith", display_members)
|
|
||||||
self.assertIn("<span class='usa-tag'>Domain requestor</span>", display_members)
|
|
||||||
self.assertIn("Program", display_members)
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue