NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 01:06:11 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

12589 objectpermission test fixes

Browse Source
This commit is contained in:
Arthur 2023-06-26 08:43:26 -07:00
parent c4131af496
commit c25fee9315
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/users/forms/bulk_import.py
View File

@ -22,10 +22,9 @@ class GroupImportForm(NetBoxModelImportForm):
class ObjectPermissionImportForm(NetBoxModelImportForm): class ObjectPermissionImportForm(NetBoxModelImportForm):
slug = SlugField()
class Meta: class Meta:
model = ObjectPermission model = ObjectPermission
fields = ( fields = (
'name', 'name', 'enabled',
) )

6
netbox/utilities/testing/views.py
View File

@ -468,7 +468,7 @@ class ViewTestCases:
self.assertIn(instance1.get_absolute_url(), content) self.assertIn(instance1.get_absolute_url(), content)
self.assertNotIn(instance2.get_absolute_url(), content) self.assertNotIn(instance2.get_absolute_url(), content)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user', 'auth.group']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user', 'auth.group', 'users.objectpermission'])
def test_export_objects(self): def test_export_objects(self):
url = self._get_url('list') url = self._get_url('list')
@ -704,7 +704,7 @@ class ViewTestCases:
with disable_warnings('django.request'): with disable_warnings('django.request'):
self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403) self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user', 'auth.group']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user', 'auth.group', 'users.objectpermission'])
def test_bulk_edit_objects_with_permission(self): def test_bulk_edit_objects_with_permission(self):
pk_list = list(self._get_queryset().values_list('pk', flat=True)[:3]) pk_list = list(self._get_queryset().values_list('pk', flat=True)[:3])
data = { data = {
@ -729,7 +729,7 @@ class ViewTestCases:
for i, instance in enumerate(self._get_queryset().filter(pk__in=pk_list)): for i, instance in enumerate(self._get_queryset().filter(pk__in=pk_list)):
self.assertInstanceEqual(instance, self.bulk_edit_data) self.assertInstanceEqual(instance, self.bulk_edit_data)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user', 'auth.group']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user', 'auth.group', 'users.objectpermission'])
def test_bulk_edit_objects_with_constrained_permission(self): def test_bulk_edit_objects_with_constrained_permission(self):
pk_list = list(self._get_queryset().values_list('pk', flat=True)[:3]) pk_list = list(self._get_queryset().values_list('pk', flat=True)[:3])
data = { data = {