fix(eng/test-validate_forms): Show error if form is not valid (#13045)

Author: kiblik

dojo/engagement/views.py

@@ -878,13 +878,11 @@ def validate_forms(
         level are bubbled up to the user first before we process too much
         """
         form_validation_list = []
-        if context.get("form") is not None:
-            form_validation_list.append(context.get("form").is_valid())
-        if context.get("jform") is not None:
-            form_validation_list.append(context.get("jform").is_valid())
-        if context.get("cred_form") is not None:
-            form_validation_list.append(context.get("cred_form").is_valid())
-        return all(form_validation_list)
+        for form_name in ["form", "jform", "cred_form"]:
+            if (form := context.get(form_name)) is not None:
+                if errors := form.errors:
+                    form_validation_list.append(errors)
+        return form_validation_list
 
     def create_engagement(
         self,
@@ -1091,7 +1089,9 @@ def post(
         )
         request._start_time = time.perf_counter()
         # ensure all three forms are valid first before moving forward
-        if not self.validate_forms(context):
+        if form_errors := self.validate_forms(context):
+            for form_error in form_errors:
+                add_error_message_to_response(form_error)
             return self.failure_redirect(request, context)
         # Process the jira form if it is present
         if form_error := self.process_jira_form(request, context.get("jform"), context):

dojo/test/views.py

@@ -879,11 +879,11 @@ def validate_forms(
         level are bubbled up to the user first before we process too much
         """
         form_validation_list = []
-        if context.get("form") is not None:
-            form_validation_list.append(context.get("form").is_valid())
-        if context.get("jform") is not None:
-            form_validation_list.append(context.get("jform").is_valid())
-        return all(form_validation_list)
+        for form_name in ["form", "jform"]:
+            if (form := context.get(form_name)) is not None:
+                if errors := form.errors:
+                    form_validation_list.append(errors)
+        return form_validation_list
 
     def process_form(
         self,
@@ -1031,8 +1031,10 @@ def post(
         )
         request._start_time = time.perf_counter()
         # ensure all three forms are valid first before moving forward
-        if not self.validate_forms(context):
-            return self.failure_redirect(context)
+        if form_errors := self.validate_forms(context):
+            for form_error in form_errors:
+                add_error_message_to_response(form_error)
+            return self.failure_redirect(request, context)
         # Process the jira form if it is present
         if form_error := self.process_jira_form(request, context.get("jform"), context):
             add_error_message_to_response(form_error)

unittests/test_import_reimport.py

@@ -2049,7 +2049,13 @@ def import_scan_ui(self, engagement, payload):
         # response = self.client_ui.post(reverse('import_scan_results', args=(engagement, )), urlencode(payload), content_type='application/x-www-form-urlencoded')
         response = self.client_ui.post(reverse("import_scan_results", args=(engagement, )), payload)
 
-        test = Test.objects.get(id=response.url.split("/")[-1])
+        url_split = response.url.split("/")
+        self.assertEqual(url_split[1], "test", response.url)
+        try:
+            test_id = int(url_split[-1])
+        except ValueError:
+            self.fail(f"'{url_split[-1]}' in {response.url} is not a number")
+        test = Test.objects.get(id=test_id)
         # f = Path('response.html').open('w+')
         # f.write(str(response.content, 'utf-8'))
         # f.close()