From 9c0a7e15e8bd7eea5a13ae177fcb472bfe875c6c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 26 Nov 2024 19:56:46 -0500
Subject: [PATCH] added some additional test code to boost coverage, fixed
 is_portfolio_admin, and formatting

---
 src/registrar/models/user.py               | 2 +-
 src/registrar/templates/domain_detail.html | 2 +-
 src/registrar/tests/test_views_domain.py   | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index 473641d29..6c9c37c92 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -259,7 +259,7 @@ class User(AbstractUser):
         return self._has_portfolio_permission(portfolio, UserPortfolioPermissionChoices.EDIT_SUBORGANIZATION)
 
     def is_portfolio_admin(self, portfolio):
-        return self.has_edit_suborganization_portfolio_permission(portfolio)
+        return "Admin" in self.portfolio_role_summary(portfolio)
 
     def get_first_portfolio(self):
         permission = self.portfolio_permissions.first()
diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index d6d4ee3c3..57463028d 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -20,7 +20,6 @@
   {% endblock breadcrumb %}
 
   {{ block.super }}
-
   <div class="margin-top-4 tablet:grid-col-10">
     <h2 class="text-bold text-primary-dark domain-name-wrap">{{ domain.name }}</h2>
     <div
@@ -78,6 +77,7 @@
       {% endif %}
     {% endif %}
 
+    
     {% url 'domain-dns-nameservers' pk=domain.id as url %}
     {% if domain.nameservers|length > 0 %}
       {% include "includes/summary_item.html" with title='DNS name servers' domains='true' value=domain.nameservers list='true' edit_link=url editable=is_editable %}
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 39b9ed241..b0c1fca1f 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -142,6 +142,7 @@ class TestWithDomainPermissions(TestWithUser):
     def tearDown(self):
         try:
             UserDomainRole.objects.all().delete()
+            DomainInvitation.objects.all().delete()
             if hasattr(self.domain, "contacts"):
                 self.domain.contacts.all().delete()
             DomainRequest.objects.all().delete()
@@ -382,6 +383,8 @@ class TestDomainDetail(TestDomainOverview):
         )
         # Check that user does not have option to Edit domain
         self.assertNotContains(detail_page, "Edit")
+        # Check that invited domain manager section not displayed when no invited domain managers
+        self.assertNotContains(detail_page, "Invited domain managers")
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -404,6 +407,8 @@ class TestDomainDetail(TestDomainOverview):
         UserPortfolioPermission.objects.get_or_create(
             user=user, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
         )
+        # add a domain invitation
+        DomainInvitation.objects.get_or_create(email="invited@example.com", domain=domain)
         user.refresh_from_db()
         self.client.force_login(user)
         detail_page = self.client.get(f"/domain/{domain.id}")
@@ -414,6 +419,9 @@ class TestDomainDetail(TestDomainOverview):
         )
         # Check that user does not have option to Edit domain
         self.assertNotContains(detail_page, "Edit")
+        # Check that invited domain manager is displayed
+        self.assertContains(detail_page, "Invited domain managers")
+        self.assertContains(detail_page, "invited@example.com")
 
 
 class TestDomainManagers(TestDomainOverview):