refactor: add tests for specific cases

Author: ccailly

js/modules/Forms/RendererController.js

@@ -146,13 +146,15 @@ export class GlpiFormRendererController
             dataType: 'json',
         });
 
-        // Remove previous error messages
+        // Remove previous error messages and aria attributes
         $(this.#target)
             .find(".invalid-tooltip")
             .remove();
         $(this.#target)
             .find(".is-invalid")
-            .removeClass("is-invalid");
+            .removeClass("is-invalid")
+            .removeAttr("aria-invalid")
+            .removeAttr("aria-errormessage");
 
         if (response.success === false) {
             Object.values(response.errors).forEach(error => {
@@ -161,13 +163,13 @@ export class GlpiFormRendererController
                 if (!question.length) {
                     return;
                 }
-                
+
                 // Find the input field within the question
                 const inputField = question.find('input:not([data-uploader-name]), select, textarea');
                 if (!inputField.length) {
                     return;
                 }
-                
+
                 // Generate a unique ID for the error message
                 const errorId = `error-${error.question_id}`;
 

phpunit/functional/Glpi/Form/AnswersHandler/AnswersHandlerTest.php

@@ -42,6 +42,7 @@
 use Glpi\Form\Condition\LogicOperator;
 use Glpi\Form\Condition\Type;
 use Glpi\Form\Condition\ValueOperator;
+use Glpi\Form\Condition\VisibilityStrategy;
 use Glpi\Form\Destination\FormDestinationChange;
 use Glpi\Form\Destination\FormDestinationProblem;
 use Glpi\Form\Destination\FormDestinationTicket;
@@ -223,6 +224,58 @@ public function testValidateAnswers(): void
         $this->assertCount(1, $result->getErrors(), "There should be one error when a mandatory field contains an empty string");
     }
 
+    public function testValidateAnswersWithConditions(): void
+    {
+        self::login();
+
+        // Create a form with conditional questions
+        $builder = new FormBuilder("Conditional Validation Test Form");
+        $builder
+            ->addQuestion("Main Question", QuestionTypeShortText::class, is_mandatory: true)
+            ->addQuestion("Conditional Question", QuestionTypeShortText::class, is_mandatory: true)
+            ->setQuestionVisibility(
+                "Conditional Question",
+                VisibilityStrategy::VISIBLE_IF,
+                [
+                    [
+                        'logic_operator' => LogicOperator::AND,
+                        'item_name'      => "Main Question",
+                        'item_type'      => Type::QUESTION,
+                        'value_operator' => ValueOperator::EQUALS,
+                        'value'          => "Show Conditional",
+                    ],
+                ]
+            )
+        ;
+        $form = self::createForm($builder);
+
+        // Get handler instance
+        $handler = AnswersHandler::getInstance();
+
+        // Test 1: Conditional question is shown - should be valid
+        $conditional_answers = [
+            self::getQuestionId($form, "Main Question") => "Show Conditional",
+            self::getQuestionId($form, "Conditional Question") => "This is a conditional answer",
+        ];
+        $result = $handler->validateAnswers($form, $conditional_answers);
+        $this->assertTrue($result->isValid(), "Validation should pass when the conditional question is shown and filled");
+
+        // Test 2: Conditional question is not shown - should be valid
+        $non_conditional_answers = [
+            self::getQuestionId($form, "Main Question") => "Do not show"
+        ];
+        $result = $handler->validateAnswers($form, $non_conditional_answers);
+        $this->assertTrue($result->isValid(), "Validation should pass when the conditional question is not shown");
+
+        // Test 3: Conditional question is shown but not filled - should be invalid
+        $missing_conditional_answers = [
+            self::getQuestionId($form, "Main Question") => "Show Conditional",
+            self::getQuestionId($form, "Conditional Question") => "",
+        ];
+        $result = $handler->validateAnswers($form, $missing_conditional_answers);
+        $this->assertFalse($result->isValid(), "Validation should fail when the conditional question is shown but not filled");
+    }
+
     private function validateAnswers(
         Form $form,
         array $answers,

tests/cypress/e2e/form/form_rendering.cy.js

@@ -156,6 +156,71 @@ describe('Form rendering', () => {
             cy.findByText('Form submitted').should('be.visible');
         });
     });
+
+    it.only('Mandatory question alert is correctly removed when value is set and go to next section', () => {
+        // Set up a form with two sections, each with a mandatory question
+        cy.createWithAPI('Glpi\\Form\\Form', {
+            'name': 'Test mandatory questions',
+        }).as('form_id');
+        cy.get('@form_id').then((form_id) => {
+            // Add mandatory question to default section
+            cy.addQuestionToDefaultSectionWithAPI(
+                form_id,
+                'First question',
+                'Glpi\\Form\\QuestionType\\QuestionTypeShortText',
+                0,
+                null,
+                null,
+                null,
+                true // Mandatory
+            );
+
+            // Add second section
+            cy.createWithAPI('Glpi\\Form\\Section', {
+                'name': 'Second section',
+                'rank': 1,
+                'forms_forms_id': form_id,
+            }).as('second_section_id');
+
+            cy.get('@second_section_id').then((second_section_id) => {
+                // Add mandatory question to second section
+                cy.createWithAPI('Glpi\\Form\\Question', {
+                    'name': 'Second question',
+                    'type': 'Glpi\\Form\\QuestionType\\QuestionTypeShortText',
+                    'vertical_rank': 1,
+                    'forms_sections_id': second_section_id,
+                    'is_mandatory' : true,
+                }).as('second_section_id');
+            });
+
+            // Preview form
+            cy.login();
+            cy.visit(`/Form/Render/${form_id}`);
+
+            // Try to submit first section, should fail since we didn't answer
+            // the mandatory question
+            cy.findByRole('button', {name: 'Continue'}).click();
+            checkMandatoryQuestion('First question');
+            cy.findByRole('heading', {name: 'First section'}).should('be.visible');
+            cy.findByRole('heading', {name: 'Second section'}).should('not.exist');
+
+            // Submit again with a value
+            cy.findByRole('textbox', {name: 'First question'}).type("test");
+            cy.findByRole('button', {name: 'Continue'}).click();
+            cy.findByRole('heading', {name: 'Second section'}).should('be.visible');
+            cy.findByRole('heading', {name: 'First section'}).should('not.exist');
+
+            // Go back to first section
+            cy.findByRole('button', {name: 'Back'}).click();
+            cy.findByRole('heading', {name: 'First section'}).should('be.visible');
+
+            // Check that the error message isn't displayed anymore
+            getAriaErrorMessageElement(cy.findByRole('textbox', {name: 'First question'}))
+                .should('not.exist');
+            cy.findByRole('textbox', {name: 'First question'}).should('not.have.attr', 'aria-invalid');
+            cy.findByRole('textbox', {name: 'First question'}).should('not.have.attr', 'aria-errormessage');
+        });
+    });
 });
 
 function addQuestionAndGetUuuid(name, type = null, subtype = null) {