chore: fix failing tests

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

component_catalog/admin.py

@@ -555,15 +555,23 @@ def get_actions(self, request):
             del actions["set_policy"]
         return actions
 
-    def log_deletion(self, request, object, object_repr):
+    def delete_model(self, request, obj):
         """
+        Handle single object deletion from the delete view.
         Add the option to delete associated `Package` instances.
-        We use this method rather than `self.delete_model()` since we want to support both
-        the delete_view and the `delete_selected` action.
         """
-        super().log_deletion(request, object, object_repr)
         if request.POST.get("delete_packages"):
-            object.packages.all().delete()
+            obj.packages.all().delete()
+        super().delete_model(request, obj)
+
+    def delete_queryset(self, request, queryset):
+        """
+        Handle bulk deletion from the delete_selected action.
+        Add the option to delete associated `Package` instances.
+        """
+        if request.POST.get("delete_packages"):
+            Package.objects.filter(component__in=queryset).delete()
+        super().delete_queryset(request, queryset)
 
     def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
         """

component_catalog/tests/test_admin.py

@@ -2204,18 +2204,20 @@ def test_component_admin_delete_confirmation_include_associated_packages(self):
         expected = "Would you also like to delete Packages associated with this Component"
         self.assertNotContains(response, expected)
 
-        package1 = Package.objects.create(filename="package1.zip", dataspace=self.dataspace1)
+        package1 = make_package(dataspace=self.dataspace1, filename="package1.zip")
         ComponentAssignedPackage.objects.create(
             component=self.component1, package=package1, dataspace=self.dataspace1
         )
-        package2 = Package.objects.create(filename="package2.zip", dataspace=self.dataspace1)
+        package2 = make_package(dataspace=self.dataspace1, filename="package2.zip")
         ComponentAssignedPackage.objects.create(
             component=self.component1, package=package2, dataspace=self.dataspace1
         )
+        self.assertEqual(2, self.component1.packages.count())
 
-        self.assertTrue(self.component1.packages.exists())
         response = self.client.get(delete_url)
         self.assertContains(response, expected)
+        field = '<input type="checkbox" name="enable_delete_packages" id="enable_delete_packages">'
+        self.assertContains(response, field)
 
         data = {
             "post": "yes",
@@ -2224,9 +2226,10 @@ def test_component_admin_delete_confirmation_include_associated_packages(self):
         response = self.client.post(delete_url, data=data, follow=True)
         self.assertContains(response, "was deleted successfully.")
         self.assertFalse(Component.objects.filter(pk=self.component1.pk).exists())
-        self.assertFalse(Package.objects.filter(pk__in=[package1.pk, package2.pk]).exists())
+        package_qs = Package.objects.filter(pk__in=[package1.pk, package2.pk])
+        self.assertFalse(package_qs.exists())
 
-        package3 = Package.objects.create(filename="package3.zip", dataspace=self.dataspace1)
+        package3 = make_package(dataspace=self.dataspace1, filename="package3.zip")
         ComponentAssignedPackage.objects.create(
             component=self.component2, package=package3, dataspace=self.dataspace1
         )