Fix parts of the failing tests #241

Signed-off-by: tdruez <[email protected]>

Author: tdruez

product_portfolio/forms.py

@@ -678,7 +678,7 @@ def submit(self, product, user):
 
 
 def validate_sbom_file(value):
-    """Validator for SBOM JSON file."""
+    """Validate SBOM JSON file content."""
     filename = value.name.lower()
     if not filename.endswith(".json"):
         return
@@ -695,7 +695,7 @@ def validate_sbom_file(value):
         tool_name = headers[0].get("tool_name", "")
         if "scan" in tool_name.lower():
             raise ValidationError(
-                'Your file appears to be a ScanCode scan results. '
+                "Your file appears to be a ScanCode scan results. "
                 'You want to use the "Import ScanCode scan results" action instead.'
             )
 

product_portfolio/tests/test_api.py

@@ -371,7 +371,7 @@ def test_api_product_endpoint_load_sboms_action(self):
         self.assertEqual(expected, response.data)
 
         data = {
-            "input_file": ContentFile("Content", name="sbom.json"),
+            "input_file": ContentFile("{}", name="sbom.json"),
             "update_existing_packages": False,
             "scan_all_packages": False,
         }

product_portfolio/tests/test_views.py

@@ -223,13 +223,13 @@ def test_product_portfolio_detail_view_tab_imports_view(self):
         htmx_refresh = 'hx-trigger="load delay:10s" hx-swap="outerHTML"'
         self.assertContains(response, htmx_refresh)
         self.assertContains(response, "Imports are currently in progress.")
-        self.assertContains(response, "Import SBOMs")
+        self.assertContains(response, "Import SBOM")
 
         project.status = ScanCodeProject.Status.SUCCESS
         project.save()
         response = self.client.get(url)
         self.assertFalse(response.context["has_projects_in_progress"])
-        self.assertContains(response, "Import SBOMs")
+        self.assertContains(response, "Import SBOM")
         self.assertNotContains(response, "hx-trigger")
         self.assertNotContains(response, "Imports are currently in progress.")
 
@@ -3090,15 +3090,14 @@ def test_product_portfolio_load_sbom_view(self, mock_submit):
         expected = "Import SBOM"
         self.assertContains(response, expected)
 
-        data = {"input_file": ContentFile("Data")}
+        data = {"input_file": ContentFile("{}", name="file.json")}
         response = self.client.post(url, data=data, follow=True)
         expected = "SBOM file submitted to ScanCode.io for inspection."
         self.assertContains(response, expected)
         self.assertEqual(1, ScanCodeProject.objects.count())
 
         with override_settings(CLAMD_ENABLED=True):
             with mock.patch("dje.fields.SmartFileField.scan_file_for_virus") as scan:
-                data = {"input_file": ContentFile("Data")}
                 self.client.post(url, data=data, follow=True)
                 scan.assert_called_once()