12589 group test fixes

netbox/users/forms/bulk_import.py

@@ -9,22 +9,10 @@ from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugFiel
 __all__ = (
     'GroupImportForm',
     'ObjectPermissionImportForm',
-    'UserImportForm',
 )
 
 
-class UserImportForm(NetBoxModelImportForm):
-    slug = SlugField()
-
-    class Meta:
-        model = NetBoxUser
-        fields = (
-            'email',
-        )
-
-
 class GroupImportForm(NetBoxModelImportForm):
-    slug = SlugField()
 
     class Meta:
         model = NetBoxGroup

netbox/users/urls.py

@@ -14,7 +14,6 @@ urlpatterns = [
     # Users
     path('users/', views.NetBoxUserListView.as_view(), name='netboxuser_list'),
     path('users/add/', views.NetBoxUserEditView.as_view(), name='netboxuser_add'),
-    path('users/import/', views.NetBoxUserBulkImportView.as_view(), name='netboxuser_import'),
     path('users/edit/', views.NetBoxUserBulkEditView.as_view(), name='netboxuser_bulk_edit'),
     path('users/delete/', views.NetBoxUserBulkDeleteView.as_view(), name='netboxuser_bulk_delete'),
     path('users/<int:pk>/', include(get_model_urls('users', 'netboxuser'))),
@@ -23,7 +22,6 @@ urlpatterns = [
     path('groups/', views.NetBoxGroupListView.as_view(), name='netboxgroup_list'),
     path('groups/add/', views.NetBoxGroupEditView.as_view(), name='netboxgroup_add'),
     path('groups/import/', views.NetBoxGroupBulkImportView.as_view(), name='netboxgroup_import'),
-    # path('groups/edit/', views.NetBoxGroupBulkEditView.as_view(), name='netboxgroup_bulk_edit'),
     path('groups/delete/', views.NetBoxGroupBulkDeleteView.as_view(), name='netboxgroup_bulk_delete'),
     path('groups/<int:pk>/', include(get_model_urls('users', 'netboxgroup'))),
 

netbox/users/views.py

@@ -399,26 +399,6 @@ class NetBoxUserDeleteView(generic.ObjectDeleteView):
         return get_permission_for_model(User, 'delete')
 
 
-class NetBoxUserBulkImportView(generic.BulkImportView):
-    queryset = NetBoxUser.objects.all()
-    model_form = forms.UserImportForm
-
-    def get_required_permission(self):
-        return get_permission_for_model(User, 'add')
-
-    def dispatch(self, request, *args, **kwargs):
-        # breakpoint()
-        return super().dispatch(request, *args, **kwargs)
-
-    def get(self, request, *args, **kwargs):
-        # breakpoint()
-        return super().get(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        # breakpoint()
-        return super().post(request, *args, **kwargs)
-
-
 class NetBoxUserBulkEditView(generic.BulkEditView):
     queryset = NetBoxUser.objects.all()
     filterset = filtersets.UserFilterSet

netbox/utilities/testing/views.py

@@ -987,3 +987,33 @@ class ViewTestCases:
         TestCase suitable for testing device component models (ConsolePorts, Interfaces, etc.)
         """
         maxDiff = None
+
+    class UserViewTestCase(
+        GetObjectViewTestCase,
+        GetObjectChangelogViewTestCase,
+        CreateObjectViewTestCase,
+        EditObjectViewTestCase,
+        DeleteObjectViewTestCase,
+        ListObjectsViewTestCase,
+        BulkEditObjectsViewTestCase,
+        BulkDeleteObjectsViewTestCase,
+    ):
+        """
+        TestCase suitable for testing all standard View functions for auth.user objects
+        """
+        maxDiff = None
+
+    class GroupViewTestCase(
+        GetObjectViewTestCase,
+        GetObjectChangelogViewTestCase,
+        CreateObjectViewTestCase,
+        EditObjectViewTestCase,
+        DeleteObjectViewTestCase,
+        ListObjectsViewTestCase,
+        BulkImportObjectsViewTestCase,
+        BulkDeleteObjectsViewTestCase,
+    ):
+        """
+        TestCase suitable for testing all standard View functions for auth.group objects
+        """
+        maxDiff = None