fix tests

Author: valentijnscholten

dojo/risk_acceptance/helper.py

@@ -35,6 +35,7 @@ def expire_now(risk_acceptance):
                 # this method both saves and pushed to JIRA (no other post processing)
                 finding.save(dedupe_option=False)
                 if jira_helper.is_push_all_issues(finding) or jira_helper.is_keep_in_sync_with_jira(finding):
+                    logger.info("pushing finding to JIRA after expiration of risk acceptance")
                     jira_helper.push_to_jira(finding)
 
                 reactivated_findings.append(finding)
@@ -76,6 +77,7 @@ def reinstate(risk_acceptance, old_expiration_date):
                 # this method both saves and pushed to JIRA (no other post processing)
                 finding.save(dedupe_option=False)
                 if jira_helper.is_push_all_issues(finding) or jira_helper.is_keep_in_sync_with_jira(finding):
+                    logger.info("pushing finding to JIRA after reinstating risk acceptance")
                     jira_helper.push_to_jira(finding)
                 reinstated_findings.append(finding)
             else:
@@ -119,6 +121,7 @@ def remove_finding_from_risk_acceptance(user: Dojo_User, risk_acceptance: Risk_A
     # this method both saves and pushed to JIRA (no other post processing)
     finding.save(dedupe_option=False)
     if jira_helper.is_push_all_issues(finding) or jira_helper.is_keep_in_sync_with_jira(finding):
+        logger.info("pushing finding to JIRA after removal from risk acceptance")
         jira_helper.push_to_jira(finding)
 
     # best effort jira integration, no status changes
@@ -144,7 +147,13 @@ def add_findings_to_risk_acceptance(user: Dojo_User, risk_acceptance: Risk_Accep
             finding.save(dedupe_option=False)
             # Update any endpoint statuses on each of the findings
             update_endpoint_statuses(finding, accept_risk=True)
+
             risk_acceptance.accepted_findings.add(finding)
+
+            if jira_helper.is_push_all_issues(finding) or jira_helper.is_keep_in_sync_with_jira(finding):
+                logger.info("pushing finding to JIRA after adding to risk acceptance")
+                jira_helper.push_to_jira(finding)
+
         # Add a note to reflect that the finding was removed from the risk acceptance
         if user is not None:
             finding.notes.add(Notes.objects.create(

unittests/test_jira_import_and_pushing_api.py

@@ -1,5 +1,6 @@
 # from unittest import skip
 import logging
+from unittest.mock import patch
 
 from crum import impersonate
 from django.urls import reverse
@@ -70,7 +71,6 @@ def setUp(self):
         self.testuser = User.objects.get(username="admin")
         self.testuser.usercontactinfo.block_execution = True
         self.testuser.usercontactinfo.save()
-
         token = Token.objects.get(user=self.testuser)
         self.client = APIClient()
         self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
@@ -321,7 +321,7 @@ def add_risk_acceptance(self, eid, data_risk_accceptance, fid=None):
         self.assertEqual(302, response.status_code, response.content[:1000])
         return response
 
-    def test_import_grouped_reopen_expired_sla(self):
+    def test_import_grouped_reopen_expired_risk_acceptance(self):
         # steps
         # import scan, make sure they are in grouped JIRA
         # risk acceptance all the grouped findings, make sure they are closed in JIRA
@@ -374,6 +374,59 @@ def test_import_grouped_reopen_expired_sla(self):
         # by asserting full cassette is played we know all calls to JIRA have been made as expected
         self.assert_cassette_played()
 
+    @patch("dojo.decorators.we_want_async", return_value=False)
+    def test_import_grouped_reopen_expired_risk_acceptance_with_finding_sync(self, mock):
+        # steps
+        # import scan, make sure they are in grouped JIRA
+        # risk acceptance all the grouped findings, make sure they are closed in JIRA
+        # expire risk acceptance on all grouped findings, make sure they are open in JIRA
+        JIRA_Instance.objects.update(finding_jira_sync=True)
+
+        import0 = self.import_scan_with_params(self.npm_groups_sample_filename, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
+        test_id = import0["test"]
+        self.assert_jira_issue_count_in_test(test_id, 0)
+        self.assert_jira_group_issue_count_in_test(test_id, 3)
+        findings = self.get_test_findings_api(test_id)
+        finding_id = findings["results"][0]["id"]
+
+        ra_data = {
+            "name": "Accept: Unit test",
+            "accepted_findings": [],
+            "recommendation": "A",
+            "recommendation_details": "recommendation 1",
+            "decision": "A",
+            "decision_details": "it has been decided!",
+            "accepted_by": "pointy haired boss",
+            "owner": 1,
+            "expiration_date": "2024-12-31",
+            "reactivate_expired": True,
+            }
+
+        for finding in findings["results"]:
+            ra_data["accepted_findings"].append(finding["id"])
+
+        pre_jira_status = self.get_jira_issue_status(finding_id)
+
+        response = self.add_risk_acceptance(1, data_risk_accceptance=ra_data)
+        self.assertEqual("/engagement/1", response.url)
+
+        # we don't do any explicit push to JIRA here as it should happen automatically
+
+        post_jira_status = self.get_jira_issue_status(finding_id)
+        self.assertNotEqual(pre_jira_status, post_jira_status)
+
+        pre_jira_status = post_jira_status
+        ra = Risk_Acceptance.objects.last()
+        ra_helper.expire_now(ra)
+
+        # we don't do any explicit push to JIRA here as it should happen automatically
+
+        post_jira_status = self.get_jira_issue_status(finding_id)
+        self.assertNotEqual(pre_jira_status, post_jira_status)
+
+        # by asserting full cassette is played we know all calls to JIRA have been made as expected
+        self.assert_cassette_played()
+
     def test_import_with_groups_twice_push_to_jira(self):
         import0 = self.import_scan_with_params(self.npm_groups_sample_filename, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
         test_id = import0["test"]