fix unit tests

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

Author: tdruez

component_catalog/models.py

@@ -1799,6 +1799,7 @@ def only_rendering_fields(self):
             "filename",
             "license_expression",
             "risk_score",
+            "latest_non_vulnerable_version",
             "dataspace__name",
             "dataspace__show_usage_policy_in_user_views",
         )

component_catalog/tests/test_api.py

@@ -1339,7 +1339,11 @@ def test_api_package_endpoint_vulnerabilities_features(self):
         self.client.login(username="super_user", password="secret")
         vulnerability1 = make_vulnerability(self.dataspace, affecting=self.package1)
         vulnerability2 = make_vulnerability(self.dataspace)
-        self.package1.update(risk_score=9.0)
+        self.package1.update(
+            risk_score=9.0,
+            next_non_vulnerable_version="1.2.4",
+            latest_non_vulnerable_version="2.0.0",
+        )
 
         data = {"is_vulnerable": "yes"}
         response = self.client.get(self.package_list_url, data)
@@ -1349,6 +1353,8 @@ def test_api_package_endpoint_vulnerabilities_features(self):
 
         results = response.data["results"]
         self.assertEqual("9.0", results[0]["risk_score"])
+        self.assertEqual("1.2.4", results[0]["next_non_vulnerable_version"])
+        self.assertEqual("2.0.0", results[0]["latest_non_vulnerable_version"])
         self.assertEqual(
             vulnerability1.advisory_id,
             results[0]["affected_by_vulnerabilities"][0]["advisory_id"],

component_catalog/tests/test_views.py

@@ -3023,6 +3023,23 @@ def test_package_details_view_tab_vulnerabilities(self):
         self.assertContains(response, 'id="tab_vulnerabilities"')
         self.assertContains(response, self.vulnerability1.advisory_id)
 
+    def test_package_details_view_tab_vulnerabilities_fixed_by_packages(self):
+        fixing_package = make_package(self.dataspace, package_url="pkg:pypi/idna@3.7")
+        self.vulnerability1.fixed_by_packages = [
+            "pkg:pypi/idna@3.7",
+            "pkg:pypi/idna@9.9.9",
+        ]
+        self.vulnerability1.save()
+
+        self.client.login(username=self.super_user.username, password="secret")
+        response = self.client.get(self.package1.details_url)
+
+        # A known package is linked directly.
+        self.assertContains(response, fixing_package.get_absolute_url())
+        # An unknown package offers an "Add Package" link instead.
+        self.assertContains(response, "idna@9.9.9")
+        self.assertContains(response, "package_url=pkg:pypi/idna@9.9.9")
+
     def test_vulnerablecode_get_plain_purls(self):
         purls = get_plain_purls(packages=[])
         self.assertEqual([], purls)

dje/tests/testfiles/test_dataset_cc_only.json

@@ -315,7 +315,9 @@
     "api_data_url": "",
     "datasource_id": "",
     "file_references": [],
-    "parties": []
+    "parties": [],
+    "next_non_vulnerable_version": "",
+    "latest_non_vulnerable_version": ""
   }
 },
 {

dje/tests/testfiles/test_dataset_pp_only.json

@@ -49,7 +49,9 @@
     "api_data_url": "",
     "datasource_id": "",
     "file_references": [],
-    "parties": []
+    "parties": [],
+    "next_non_vulnerable_version": "",
+    "latest_non_vulnerable_version": ""
   }
 },
 {

vulnerabilities/tests/test_api.py

@@ -96,6 +96,8 @@ def test_api_vulnerabilities_list_endpoint_filters(self):
         self.assertContains(response, self.vulnerability3.advisory_id)
 
     def test_api_vulnerabilities_detail_endpoint(self):
+        self.vulnerability1.fixed_by_packages = ["pkg:pypi/idna@3.7"]
+        self.vulnerability1.save()
         detail_url = reverse("api_v2:vulnerability-detail", args=[self.vulnerability1.uuid])
         self.client.login(username="super_user", password="secret")
 
@@ -107,6 +109,7 @@ def test_api_vulnerabilities_detail_endpoint(self):
         self.assertEqual(self.vulnerability1.advisory_uid, response.data["advisory_uid"])
         self.assertEqual(str(self.vulnerability1.uuid), response.data["uuid"])
         self.assertEqual("0.0", response.data["risk_score"])
+        self.assertEqual(["pkg:pypi/idna@3.7"], response.data["fixed_by_packages"])
         self.assertEqual(1, len(response.data["affected_packages"]))
         self.assertEqual(1, len(response.data["affected_products"]))