Add unit tests

Author: Maffooch

dojo/importers/default_reimporter.py

@@ -359,6 +359,8 @@ def process_findings(
                         unsaved_finding,
                         existing_finding,
                     )
+                    # Findings that have already exist cannot be moved to into a group
+                    finding_will_be_grouped = False
                     # Determine if we should skip the rest of the loop
                     if force_continue:
                         continue
@@ -373,8 +375,6 @@ def process_findings(
                             unsaved_finding,
                             self.user,
                         )
-                    # Findings that have already exist cannot be moved to into a group
-                    finding_will_be_grouped = False
                 else:
                     finding, finding_will_be_grouped = self.process_finding_that_was_not_matched(unsaved_finding)
 

unittests/test_jira_import_and_pushing_api.py

@@ -185,6 +185,15 @@ def test_import_with_groups_with_push_to_jira_is_false_but_push_all(self):
         # by asserting full cassette is played we know issues have been updated in JIRA
         self.assert_cassette_played()
 
+    def test_import_with_group_by_with_push_all_but_no_groups_created(self):
+        self.set_jira_push_all_issues(self.get_engagement(1))
+        import0 = self.import_scan_with_params(self.zap_sample5_filename, group_by="component_name+component_version", verified=True)
+        test_id = import0["test"]
+        self.assert_jira_issue_count_in_test(test_id, 2)
+        self.assert_jira_group_issue_count_in_test(test_id, 0)
+        # by asserting full cassette is played we know issues have been updated in JIRA
+        self.assert_cassette_played()
+
     def test_import_no_push_to_jira_reimport_no_push_to_jira(self):
         import0 = self.import_scan_with_params(self.zap_sample5_filename, verified=True)
         test_id = import0["test"]