lint, clean up tests, clean up user displays in admin (remove is_staff and is_superuser and replace with group)

This commit is contained in:
Rachid Mrad 2023-09-29 16:54:29 -04:00
parent 8db5219986
commit 11c0186b09
No known key found for this signature in database
GPG key ID: EF38E4CEC4A8F3CF
2 changed files with 12 additions and 13 deletions

View file

@ -18,6 +18,7 @@ from registrar.models import (
DomainInformation,
User,
DomainInvitation,
UserGroup,
)
from .common import (
completed_application,
@ -51,7 +52,7 @@ class TestDomainAdmin(MockEppLib):
self.staffuser = create_user()
super().setUp()
@skip("EPP sabotage")
@skip("Why did this test stop working, and is is a good test")
def test_place_and_remove_hold(self):
domain = create_ready_domain()
# get admin page and assert Place Hold button
@ -61,7 +62,7 @@ class TestDomainAdmin(MockEppLib):
"/admin/registrar/domain/{}/change/".format(domain.pk),
follow=True,
)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
self.assertContains(response, "Place hold")
self.assertNotContains(response, "Remove hold")
@ -786,8 +787,7 @@ class MyUserAdminTest(TestCase):
"email",
"first_name",
"last_name",
"is_staff",
"is_superuser",
"first_group",
"status",
)
@ -801,14 +801,14 @@ class MyUserAdminTest(TestCase):
expected_fieldsets = super(MyUserAdmin, self.admin).get_fieldsets(request)
self.assertEqual(fieldsets, expected_fieldsets)
def test_get_fieldsets_non_superuser(self):
def test_get_fieldsets_cisa_analyst(self):
request = self.client.request().wsgi_request
request.user = create_user()
fieldsets = self.admin.get_fieldsets(request)
expected_fieldsets = (
(None, {"fields": ("password", "status")}),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Permissions", {"fields": ("is_active", "is_staff", "is_superuser")}),
("Permissions", {"fields": ("is_active", "groups")}),
("Important dates", {"fields": ("last_login", "date_joined")}),
)
self.assertEqual(fieldsets, expected_fieldsets)