diff --git a/src/registrar/admin.py b/src/registrar/admin.py index ff0f71426..6585d602a 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -343,10 +343,11 @@ class UserDomainRoleAdmin(ListHeaderAdmin): class DomainInvitationAdmin(ListHeaderAdmin): """Custom domain invitation admin class.""" + class Meta: model = models.DomainInvitation fields = "__all__" - + _meta = Meta() # Columns diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 089e569eb..bff27a83d 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -849,26 +849,25 @@ class TestDomainApplicationAdmin(MockEppLib): class DomainInvitationAdminTest(TestCase): + """Tests for the DomainInvitation page""" + def setUp(self): + """Create a client object""" + self.client = Client(HTTP_HOST="localhost:8080") self.factory = RequestFactory() self.admin = ListHeaderAdmin(model=DomainInvitationAdmin, admin_site=AdminSite()) - self.client = Client(HTTP_HOST="localhost:8080") self.superuser = create_superuser() - + def tearDown(self): - # delete any applications too + """Delete all DomainInvitation objects""" DomainInvitation.objects.all().delete() - DomainApplication.objects.all().delete() - User.objects.all().delete() def test_get_filters(self): + """Ensures that our filters are displaying correctly""" # Have to get creative to get past linter p = "adminpass" self.client.login(username="superuser", password=p) - # Mock a user - user = mock_user() - response = self.client.get( "/admin/registrar/domaininvitation/", {}, @@ -879,6 +878,13 @@ class DomainInvitationAdminTest(TestCase): self.assertContains(response, "invited", count=4) self.assertContains(response, "retrieved", count=4) + # Check for the HTML context specificially + invited_html = 'invited' + retrieved_html = 'retrieved' + + self.assertContains(response, invited_html, count=1) + self.assertContains(response, retrieved_html, count=1) + class ListHeaderAdminTest(TestCase): def setUp(self):