itemengine-cypress-automation 1.0.240-textentrychangesreverted-28d08d1.0 → 1.0.241-28thAugustRepoUpdate-dc7df0c.0

package/cypress/e2e/ILC/BrainingCampManipulative/editTabBasicSection.js

@@ -89,9 +89,9 @@ describe('Create item : Brainingcamp manipulative - Edit tab basics', () => {
             utilities.verifyInputFieldValue(brainingCampManipulativePage.enterAShareCodeInputField(), '');
         });
 
-        it('When user focuses in and out of \'Enter a share code\' input field, then error message \'Error: Please enter share code.\' should be displayed', () => {
+        it('When user focuses in and out of \'Enter a share code\' input field, then error message \'Error: Please enter share code.\' should not be displayed', () => {
             brainingCampManipulativePage.steps.focusInAndFocusOutOfEnterAShareCodeInputField();
-            utilities.verifyInnerText(brainingCampManipulativePage.errorMessage(), 'Error: Please enter share code.');
+            utilities.verifyElementVisibilityState(brainingCampManipulativePage.errorMessage(), 'notExist')
         });
 
         brainingCampManipulativePage.tests.verifyErrorMessageCSSAndA11y();

package/cypress/e2e/ILC/ChartsBar/headerSection.js

@@ -1,5 +1,5 @@
 import abortEarlySetup from "../../../support/helpers/abortEarly";
-import { chartsBarPage } from "../../../pages";
+import { chartsBarPage, dialogBoxBase } from "../../../pages";
 import utilities from "../../../support/helpers/utilities";
 const css = Cypress.env('css');
 
@@ -94,12 +94,29 @@ describe('Create item page - Charts - Bar: Header section and saving question',
             cy.barsPreLoaderWait();
         });
 
-        chartsBarPage.tests.verifyCreateItemWrapperContentsA11y();
+        describe('Validation error messages', () => {
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points']);
 
-        it('When user clicks on "Save question" button, then the question should get saved and a snackbar with text \'Saved successfully!\' should be displayed', () => {
-            chartsBarPage.steps.saveAQuestionAndVerifySnackbar();
+            it('Validation error messages should be displayed below required input fields', () => {
+                chartsBarPage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
+                chartsBarPage.steps.verifyWarningIconOnRequiredFields(['Please set points']);
+                chartsBarPage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();
+            });
+
+            it('Validation error messages should disappear when required input fields are filled', () => {
+                chartsBarPage.steps.allotPoints(10);
+                chartsBarPage.steps.verifyErrorMessageIsNotDisplayed();
+            });
+
+            chartsBarPage.tests.verifyCreateItemWrapperContentsA11y();
         });
 
-        chartsBarPage.tests.verifySavedSuccessfullySnackbarCSSAndA11y();
+        describe('Saving a question', () => {
+            it('When user clicks on "Save question" button, then the question should get saved and a snackbar with text \'Saved successfully!\' should be displayed', () => {
+                chartsBarPage.steps.saveAQuestionAndVerifySnackbar();
+            });
+
+            chartsBarPage.tests.verifySavedSuccessfullySnackbarCSSAndA11y();
+        });
     });
 });

package/cypress/e2e/ILC/ChartsLine/headerSection.js

@@ -1,5 +1,5 @@
 import abortEarlySetup from "../../../support/helpers/abortEarly";
-import { chartsLinePage } from "../../../pages";
+import { chartsLinePage, dialogBoxBase } from "../../../pages";
 import utilities from "../../../support/helpers/utilities";
 const css = Cypress.env('css');
 
@@ -98,12 +98,30 @@ describe('Create item page - Charts - Bar: Header section and saving question',
             chartsLinePage.steps.selectLineButton();
         });
 
-        chartsLinePage.tests.verifyCreateItemWrapperContentsA11y();
+        describe('Validation error messages', () => {
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points']);
 
-        it('When user clicks on "Save question" button, then the question should get saved and a snackbar with text \'Saved successfully!\' should be displayed', () => {
-            chartsLinePage.steps.saveAQuestionAndVerifySnackbar();
+            it('Validation error messages should be displayed below required input fields', () => {
+                chartsLinePage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
+                chartsLinePage.steps.verifyWarningIconOnRequiredFields(['Please set points']);
+                chartsLinePage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();
+            });
+
+            it('Validation error messages should disappear when required input fields are filled', () => {
+                chartsLinePage.steps.allotPoints(10);
+                chartsLinePage.steps.verifyErrorMessageIsNotDisplayed();
+            });
+
+            chartsLinePage.tests.verifyCreateItemWrapperContentsA11y();
         });
 
-        chartsLinePage.tests.verifySavedSuccessfullySnackbarCSSAndA11y();
+        describe('Saving a question', () => {
+
+            it('When user clicks on "Save question" button, then the question should get saved and a snackbar with text \'Saved successfully!\' should be displayed', () => {
+                chartsLinePage.steps.saveAQuestionAndVerifySnackbar();
+            });
+
+            chartsLinePage.tests.verifySavedSuccessfullySnackbarCSSAndA11y();
+        });
     });
 });

package/cypress/e2e/ILC/ContentBlocks/editTabBasics.js

@@ -113,13 +113,12 @@ describe('Content blocks - Edit tab', () => {
             contentBlocksPage.steps.verifyTextBlockInputFieldPlaceholderTextNotExist(contentBlocksPage.verifyTextBlockInputFieldPlaceholderText);
         });
 
-        it('When user clears text and focuses out of text block input field, then error message \'Error: Text block is required.\' should be displayed', () => {
+        it('When user clears text and focuses out of text block input field, then error message should not be displayed', () => {
             contentBlocksPage.steps.clearAndFocusOutOfTextBlockInputField();
-            utilities.verifyInnerText(contentBlocksPage.errorMessage(), 'Error: Text block is required.');
-            utilities.verifyElementVisibilityState(contentBlocksPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(contentBlocksPage.errorMessage(), 'notExist');
         });
 
-        it('When user enters text again then error message should disappear', () => {
+        it('When user enters text again then error message should not be displayed', () => {
             contentBlocksPage.steps.enterTextInTextBlockInputField(0, '​​​​​​​​​​​​​​​​​​​​​Text block');
             utilities.verifyElementVisibilityState(contentBlocksPage.errorMessage(), 'notExist');
         });

package/cypress/e2e/ILC/DragAndDropIntoCategoriesNew/clickAndDrop.js

@@ -153,8 +153,7 @@ describe('Create Item Page: Drag and drop into categories: Click and drop cases
             dragAndDropIntoCategoriesPage.steps.clickAndDropOptionFromDropzoneToOptionContainerSpecifyCorrectAnswerSection('Bat');
             dragAndDropIntoCategoriesPage.steps.clickAndDropOptionFromDropzoneToOptionContainerSpecifyCorrectAnswerSection('Eagle');
             dragAndDropIntoCategoriesPage.steps.verifyDraggableOptionInOptionsContainerSpecifyCorrectAnswerSection(['Bat', 'Eagle', 'Parrot', 'Whale']);
-            utilities.verifyInnerText(dragAndDropIntoCategoriesPage.errorMessage(), 'Error: Please set a correct answer.');
-            utilities.verifyElementVisibilityState(dragAndDropIntoCategoriesPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(dragAndDropIntoCategoriesPage.errorMessage(), 'notExist');
         });
 
         dragAndDropIntoCategoriesPage.tests.verifyErrorMessageCSSAndA11y();
@@ -479,8 +478,7 @@ describe('Create Item Page: Drag and drop into categories: Click and drop cases
             dragAndDropIntoCategoriesPage.steps.clickAndDropOptionFromDropzoneToOptionContainerSpecifyCorrectAnswerSection('Eagle');
             dragAndDropIntoCategoriesPage.steps.verifyGroupedContainerContentsInSpecifyCorrectAnswerSection(0, groupedOptions[0]);
             dragAndDropIntoCategoriesPage.steps.verifyGroupedContainerContentsInSpecifyCorrectAnswerSection(1, groupedOptions[1]);
-            utilities.verifyInnerText(dragAndDropIntoCategoriesPage.errorMessage(), 'Error: Please set a correct answer.');
-            utilities.verifyElementVisibilityState(dragAndDropIntoCategoriesPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(dragAndDropIntoCategoriesPage.errorMessage(), 'notExist');
         });
 
         dragAndDropIntoCategoriesPage.tests.verifyErrorMessageCSSAndA11y();

package/cypress/e2e/ILC/DragAndDropIntoCategoriesNew/draggableOptions.js

@@ -1,4 +1,5 @@
 import { dragAndDropIntoCategoriesPage } from "../../../pages";
+import { draggableOptionsSectionComponent } from "../../../pages/components";
 import abortEarlySetup from "../../../support/helpers/abortEarly";
 import utilities from "../../../support/helpers/utilities";
 const options = ['option 1', 'option 2', 'option 3'];
@@ -115,10 +116,8 @@ describe('Create Item page - Drag and drop into categories: Draggable options se
             dragAndDropIntoCategoriesPage.steps.verifyDeleteOptionButtonDisabledState();
         });
 
-        it('When the user clicks on \'Add group\' button without entering text in the option input fields, error message \'Error: Option is required\' should be displayed', () => {
-            dragAndDropIntoCategoriesPage.steps.addGroup();
-            dragAndDropIntoCategoriesPage.steps.verifyOptionsInputFieldErrorMessage(0);
-            dragAndDropIntoCategoriesPage.steps.verifyOptionsInputFieldErrorMessage(1);
+        it('\'Add group\' button should be disabled', () => {
+            utilities.verifyElementDisabled(draggableOptionsSectionComponent.addGroupButton());
         });
 
         it('When the user enters text in the options input field, the error messages should disappear', () => {

package/cypress/e2e/ILC/DragAndDropIntoCategoriesNew/headerSection.js

@@ -42,19 +42,17 @@ describe('Create item page - Drag and drop into categories: Header section and S
         });
 
         describe('Validation error messages', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton();
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points', 'Please enter all option']);
 
             it('Validation error messages should be displayed below required input fields', () => {
                 dragAndDropIntoCategoriesPage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
-                dragAndDropIntoCategoriesPage.steps.verifyPointsFieldErrorMessageIsNotDisplayed();
-                dragAndDropIntoCategoriesPage.steps.verifyOptionsInputFieldErrorMessage(0);
-                dragAndDropIntoCategoriesPage.steps.verifySpecifyCorrectAnswerErrorIconIsVisible();
-                dragAndDropIntoCategoriesPage.steps.verifySpecifyCorrectAnswerErrorMessage();
+                dragAndDropIntoCategoriesPage.steps.verifyWarningIconOnRequiredFields(['Please set points', 'Please enter all option']);
             });
 
             it('Validation error messages should disappear when required input fields are filled', () => {
                 dragAndDropIntoCategoriesPage.steps.addInputToOptionsInputField(options);
-                dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({'Bat': 0});
+                dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Bat': 0 });
+                dragAndDropIntoCategoriesPage.steps.allotPoints(10);
                 dragAndDropIntoCategoriesPage.steps.verifyErrorMessageIsNotDisplayed();
                 dragAndDropIntoCategoriesPage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();
             });

package/cypress/e2e/ILC/EssayResponse/equationEditor.smoke.js

@@ -32,13 +32,11 @@ describe('Create question page - Essay Response: Equation Editor functionality',
         it('When user clicks on \'Equation Editor\' icon in preview tab toolbar, then Equation Editor flyout should appear with the title \'Equation editor\'', () => {
             essayResponsePage.steps.selectPreviewTabToolbarOption('Equation Editor');
             utilities.verifyElementVisibilityState(equationEditorFlyout.dialogBox(), 'visible');
-            utilities.verifyElementVisibilityState(equationEditorFlyout.dialogBoxTitle(), 'visible');
-            utilities.verifyInnerText(equationEditorFlyout.dialogBoxTitle(), 'Equation editor');
         });
 
         it('Ok button should be displayed at the bottom of the flyout', () => {
             utilities.verifyElementVisibilityState(equationEditorFlyout.buttonOk(), 'visible');
-            utilities.verifyInnerText(equationEditorFlyout.buttonOk(), 'OK');
+            utilities.verifyInnerText(equationEditorFlyout.buttonOk(), 'Done');
         });
 
         it('Equation Editor input field should be displayed and when user focuses in the input field should have cursor', () => {

package/cypress/e2e/ILC/FillInTheGapsDragAndDropNew/Scoring/allOrNothingWithCorrectPointsEqualToAlternativePoints.js

@@ -119,7 +119,7 @@ describe('Create item page - Fill in the gaps with drag and drop: All or nothing
             fillInTheGapsDragAndDropPage.steps.verifyPreviewScore(0, 20);
             fillInTheGapsDragAndDropPage.steps.switchToGradingView();
             fillInTheGapsDragAndDropPage.steps.verifyCorrectOptionIcon(0);
-            fillInTheGapsDragAndDropPage.steps.verifyCorrectOptionIcon(1);
+            fillInTheGapsDragAndDropPage.steps.verifyIncorrectOptionIcon(1);
             fillInTheGapsDragAndDropPage.steps.verifyCorrectIncorrectIconNotExist(2);
             fillInTheGapsDragAndDropPage.steps.verifyCorrectIncorrectAnswerLabel('incorrect');
             fillInTheGapsDragAndDropPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Petals'], ['Flower'], ['Leaves']]);

package/cypress/e2e/ILC/FillInTheGapsDragAndDropNew/clickAndDrop.js

@@ -152,8 +152,7 @@ describe('Create Item Page: Fill in the gaps with drag and drop: Click and drop
             fillInTheGapsDragAndDropPage.steps.clickAndDropOptionInOptionsContainerInSpecifyCorrectAnswerSection('Petals');
             fillInTheGapsDragAndDropPage.steps.clickAndDropOptionInOptionsContainerInSpecifyCorrectAnswerSection('Flower');
             fillInTheGapsDragAndDropPage.steps.verifyDraggableOptionInOptionsContainerSpecifyCorrectAnswerSection(['Petals', 'Flower', 'Stem', 'Seed']);
-            utilities.verifyInnerText(fillInTheGapsDragAndDropPage.errorMessage(), 'Error: Please set a correct answer.');
-            utilities.verifyElementVisibilityState(fillInTheGapsDragAndDropPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(fillInTheGapsDragAndDropPage.errorMessage(), 'notExist');
         });
 
         fillInTheGapsDragAndDropPage.tests.verifyErrorMessageCSSAndA11y();
@@ -474,8 +473,7 @@ describe('Create Item Page: Fill in the gaps with drag and drop: Click and drop
             fillInTheGapsDragAndDropPage.steps.clickAndDropOptionInOptionsContainerInSpecifyCorrectAnswerSection('Flower');
             fillInTheGapsDragAndDropPage.steps.verifyGroupedContainerContentsInSpecifyCorrectAnswerSection(0, groupedOptions[0]);
             fillInTheGapsDragAndDropPage.steps.verifyGroupedContainerContentsInSpecifyCorrectAnswerSection(1, groupedOptions[1]);
-            utilities.verifyInnerText(fillInTheGapsDragAndDropPage.errorMessage(), 'Error: Please set a correct answer.');
-            utilities.verifyElementVisibilityState(fillInTheGapsDragAndDropPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(fillInTheGapsDragAndDropPage.errorMessage(), 'notExist');
         });
 
         fillInTheGapsDragAndDropPage.tests.verifyErrorMessageCSSAndA11y();

package/cypress/e2e/ILC/FillInTheGapsDragAndDropNew/draggableOptions.js

@@ -1,4 +1,5 @@
 import { fillInTheGapsDragAndDropPage } from "../../../pages";
+import { draggableOptionsSectionComponent } from "../../../pages/components";
 import abortEarlySetup from "../../../support/helpers/abortEarly";
 import utilities from "../../../support/helpers/utilities";
 
@@ -106,10 +107,8 @@ describe('Create Item page - Fill in the gaps with drag and drop: Draggable opti
             fillInTheGapsDragAndDropPage.steps.verifyDeleteOptionButtonDisabledState();
         });
 
-        it('When the user clicks on \'Add group\' button without entering text in the option input fields, error message \'Error: Option is required\' should be displayed', () => {
-            fillInTheGapsDragAndDropPage.steps.addGroup();
-            fillInTheGapsDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(0);
-            fillInTheGapsDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(1);
+        it('\'Add group\' button should be disabled', () => {
+            utilities.verifyElementDisabled(draggableOptionsSectionComponent.addGroupButton());
         });
 
         it('When the user enters text in the options input field, the error messages should disappear', () => {

package/cypress/e2e/ILC/FillInTheGapsDragAndDropNew/editTabBasicSection.js

@@ -97,12 +97,12 @@ describe('Create item page - Fill in the gaps with text: Question instructions,
             };
         });
 
-        it('When the user removes all response areas from the question input field, an error message \'Error: Minimum one response token is required.\' should be displayed', () => {
+        it('When the user removes all response areas from the question input field, no error message should be displayed', () => {
             cy.log('Switching to edit tab')
             fillInTheGapsDragAndDropPage.steps.switchToEditTab();
             fillInTheGapsDragAndDropPage.steps.deleteAResponseArea(0);
             fillInTheGapsDragAndDropPage.steps.deleteAResponseArea(0);
-            utilities.verifyInnerText(fillInTheGapsDragAndDropPage.errorMessage(), 'Error: Minimum one response token is required.')
+            utilities.verifyElementVisibilityState(fillInTheGapsDragAndDropPage.errorMessage(), 'notExist');
         });
 
         fillInTheGapsDragAndDropPage.tests.verifyErrorMessageCSSAndA11y();

package/cypress/e2e/ILC/FillInTheGapsDragAndDropNew/headerSection.js

@@ -42,17 +42,16 @@ describe('Create item page - Fill in the gaps drag and drop: Header section and
         });
 
         describe('Validation error messages', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton();
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points', 'Please enter all option']);
 
             it('Validation error messages should be displayed below required input fields', () => {
-                fillInTheGapsDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(0);
-                fillInTheGapsDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(1);
-                fillInTheGapsDragAndDropPage.steps.verifySpecifyCorrectAnswerErrorIconIsVisible();
-                fillInTheGapsDragAndDropPage.steps.verifySpecifyCorrectAnswerErrorMessage();
+                fillInTheGapsDragAndDropPage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
+                fillInTheGapsDragAndDropPage.steps.verifyWarningIconOnRequiredFields(['Please set points', 'Please enter all option']);
             });
 
             it('Validation error messages should disappear when required input fields are filled', () => {
                 fillInTheGapsDragAndDropPage.steps.addInputToOptionsInputField(options);
+                fillInTheGapsDragAndDropPage.steps.allotPoints(10);
                 fillInTheGapsDragAndDropPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Flower': 0, 'Leaves': 1 });
                 fillInTheGapsDragAndDropPage.steps.verifyErrorMessageIsNotDisplayed();
                 fillInTheGapsDragAndDropPage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();

package/cypress/e2e/ILC/FillInTheGapsDropdownNew/dropdownOptionsSection.js

@@ -59,9 +59,9 @@ describe('Create item page - Fill in the gaps with dropdown: Dropdown options se
 
         fillInTheGapsDropdownPage.tests.verifyAddOptionFunctionalityForDropdownOptions();
 
-        it('When user focus in and out of any of the \'Options\' input field without typing anything, an error message should be thrown', () => {
+        it('When user focus in and out of any of the \'Options\' input field without typing anything, no error message should be thrown', () => {
             fillInTheGapsDropdownPage.steps.focusInAndFocusOutOfDropdownOptionInputField(0);
-            utilities.verifyInnerText(commonComponents.errorMessage(), 'Error: Option is required.');
+            utilities.verifyElementVisibilityState(commonComponents.errorMessage(), 'notExist');
         });
 
         it('User should be able to enter text in options input field and \'Error: Option is required.\' error message should disappear', () => {

package/cypress/e2e/ILC/FillInTheGapsDropdownNew/editTabBasicSection.js

@@ -99,12 +99,12 @@ describe('Create item page - Fill in the gaps: Question instructions, Options se
             utilities.verifyElementCount(fillInTheGapsDropdownPage.enterAriaLabelInputField(), 2);
         });
 
-        it('When the user removes all dropdowns from the question input field, an error message \'Error: Minimum one response token is required.\' should be displayed', () => {
+        it('When the user removes all dropdowns from the question input field, an error message \'Error: Minimum one response token is required.\' should not be displayed', () => {
             cy.log('Switching to edit tab')
             fillInTheGapsDropdownPage.steps.switchToEditTab();
             fillInTheGapsDropdownPage.steps.deleteAResponseArea(0);
             fillInTheGapsDropdownPage.steps.deleteAResponseArea(0);
-            utilities.verifyInnerText(fillInTheGapsDropdownPage.errorMessage(), 'Error: Minimum one response token is required.')
+            utilities.verifyElementVisibilityState(fillInTheGapsDropdownPage.errorMessage(), 'notExist');
         });
 
         fillInTheGapsDropdownPage.tests.verifyErrorMessageCSSAndA11y();

package/cypress/e2e/ILC/FillInTheGapsDropdownNew/headerSection.js

@@ -43,14 +43,11 @@ describe('Create item page - Fill in the gaps with dropdown: Header section and
         });
 
         describe('Validation error messages', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton();
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points', 'Please enter all option']);
 
             it('Validation error messages should be displayed below required input fields', () => {
                 fillInTheGapsDropdownPage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
-                fillInTheGapsDropdownPage.steps.verifyPointsFieldErrorMessageIsNotDisplayed();
-                fillInTheGapsDropdownPage.steps.verifyOptionsInputFieldErrorMessage(0);
-                fillInTheGapsDropdownPage.steps.verifySpecifyCorrectAnswerErrorMessage();
-                fillInTheGapsDropdownPage.steps.verifySpecifyCorrectAnswerErrorIconIsVisible();
+                fillInTheGapsDropdownPage.steps.verifyWarningIconOnRequiredFields(['Please set points', 'Please enter all option']);
             });
 
             it('Validation error messages should disappear when required input fields are filled', () => {
@@ -58,6 +55,7 @@ describe('Create item page - Fill in the gaps with dropdown: Header section and
                 fillInTheGapsDropdownPage.steps.addInputToDropdownOptionFields(1, optionsForDropdown);
                 fillInTheGapsDropdownPage.steps.selectResponseFromDropdownSpecifyCorrectAnswerSection(0, optionsForDropdown[0]);
                 fillInTheGapsDropdownPage.steps.selectResponseFromDropdownSpecifyCorrectAnswerSection(1, optionsForDropdown[1]);
+                fillInTheGapsDropdownPage.steps.allotPoints(10);
                 fillInTheGapsDropdownPage.steps.verifyErrorMessageIsNotDisplayed();
                 fillInTheGapsDropdownPage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();
             });

package/cypress/e2e/ILC/FillInTheGapsDropdownNew/specifyCorrectAnswerSection.js

@@ -69,7 +69,7 @@ describe('Create Item page - Fill in the gaps with dropdown: Specify correct ans
         it('When the user deletes an option assigned as correct in the correct accordion then the correct accordion should be in the expanded state and an error icon should appear on correct accordion', () => {
             fillInTheGapsDropdownPage.steps.deleteOption(1);
             fillInTheGapsDropdownPage.steps.verifyCorrectAnswerAccordionIsExpanded();
-            fillInTheGapsDropdownPage.steps.verifySpecifyCorrectAnswerErrorIconIsVisible();
+            fillInTheGapsDropdownPage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();
         });
     });
 });

package/cypress/e2e/ILC/FillInTheGapsOverImageDragAndDrop/additionalSettings.js

@@ -0,0 +1,172 @@
+import { fillInTheGapsOverImageDragAndDropPage } from "../../../pages";
+import abortEarlySetup from "../../../support/helpers/abortEarly";
+import utilities from "../../../support/helpers/utilities";
+const enumerationOptions = {
+    'Numerical': ['1', '2'],
+    'Alphabet (uppercase)': ['A', 'B'],
+    'Alphabet (lowercase)': ['a', 'b'],
+    'Roman numeral (uppercase)': ['I', 'II'],
+    'Roman numeral (lowercase)': ['i', 'ii'],
+};
+const options = ['Bat', 'Eagle'];
+const css = Cypress.env('css');
+
+describe('fill in the gaps over image with drag and drop - Additional settings : Grading view, ARIA label for dropzones', () => {
+    before(() => {
+        cy.loginAs('admin');
+    });
+
+    describe('Additional Settings: Grading view - Contents in edit tab', () => {
+        abortEarlySetup();
+        before(() => {
+            fillInTheGapsOverImageDragAndDropPage.steps.navigateToCreateQuestion('fill in the gaps over image with drag and drop');
+            cy.barsPreLoaderWait();
+            fillInTheGapsOverImageDragAndDropPage.steps.expandAdditionalSettings();
+        });
+
+        fillInTheGapsOverImageDragAndDropPage.tests.verifyGradingViewEnumerationSectionContents('Dropzone');
+
+        it('When the user selects "Without enumeration" radio button, the identifiers section should disappear', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.selectEnumerationType('without enumeration');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.identifiersLabel(), 'notExist');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.numericalToggleButton(), 'notExist');
+        });
+
+        it('When the user selects "With enumeration" radio button again, the identifiers section should appear again', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.selectEnumerationType('with enumeration');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.identifiersLabel(), 'visible');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.numericalToggleButton(), 'visible');
+        })
+    });
+
+    describe('Additional settings: Grading view - functionality in preview tab', () => {
+        abortEarlySetup();
+        before(() => {
+            fillInTheGapsOverImageDragAndDropPage.steps.navigateToCreateQuestion('fill in the gaps over image with drag and drop');
+            cy.barsPreLoaderWait();
+            fillInTheGapsOverImageDragAndDropPage.steps.addTextInQuestionInstructionsInputField('Drag and drop options into correct dropzone');
+            fillInTheGapsOverImageDragAndDropPage.steps.uploadFile('highlightImage.jpg');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyImageIsUploaded();
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(10);
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(40);
+            fillInTheGapsOverImageDragAndDropPage.steps.addInputToOptionsInputField(options);
+            fillInTheGapsOverImageDragAndDropPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Bat': 0, 'Eagle': 1 });
+            fillInTheGapsOverImageDragAndDropPage.steps.expandAdditionalSettings();
+        });
+
+        Object.keys(enumerationOptions).forEach(option => {
+            it(`When "${option}" toggle button is selected in the dropzone identifiers section, then on switching to the preview tab dropzone numeration should not be displayed`, () => {
+                fillInTheGapsOverImageDragAndDropPage.steps.selectIdentifierToggleButton(option);
+                fillInTheGapsOverImageDragAndDropPage.steps.switchToPreviewTab();
+                fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneNumerationNotExists();
+            });
+
+            it(`When the user switches to the "Grading view", then the "${option}" numeration should be displayed in the dropzones as well as correct answer options in the correct answer section`, () => {
+                fillInTheGapsOverImageDragAndDropPage.steps.switchToGradingView();
+                fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneEnumeration(enumerationOptions[option]);
+                fillInTheGapsOverImageDragAndDropPage.steps.verifyCorrectAnswerResponsesEnumeration(enumerationOptions[option]);
+                cy.log('Post step: Switch to Edit tab')
+                fillInTheGapsOverImageDragAndDropPage.steps.switchToEditTab();
+            });
+        });
+
+        it('When the user selects "without enumeration" radio button, then in the "Grading view", numeration should not be displayed for dropzones and in the correct answer section, the entire question preview should be displayed with correct answers', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.selectEnumerationType('without enumeration');
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToPreviewTab();
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToGradingView();
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyCorrectAnswerResponsesWithoutEnumeration(['Bat', 'Eagle']);
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneNumerationNotExists();
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.correctAnswersNumeration(), 'notExist');
+        });
+    });
+
+    describe('Additional settings: ARIA label for dropzones - Contents in edit tab', () => {
+        abortEarlySetup();
+        before(() => {
+            fillInTheGapsOverImageDragAndDropPage.steps.navigateToCreateQuestion('fill in the gaps over image with drag and drop');
+            cy.barsPreLoaderWait();
+            fillInTheGapsOverImageDragAndDropPage.steps.uploadFile('highlightImage.jpg');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyImageIsUploaded();
+        });
+
+        it('When the user has not added any drop zone then \'ARIA label\' input field, should not be Present', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.expandAdditionalSettings();
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.ariaLabelSectionLabel(),'notExist');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.ariaLabelInputField(),'notExist');
+        });
+
+        it('When the user has added drop zone then \'ARIA label\' input field, should be Present', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(10);
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(40);
+            fillInTheGapsOverImageDragAndDropPage.steps.addInputToOptionsInputField(options);
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.ariaLabelSectionLabel(),'exist');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.ariaLabelInputField(),'exist');
+        });
+
+        fillInTheGapsOverImageDragAndDropPage.tests.verifyAriaLabelSectionContents('dropzones');
+
+        it('When the users adds a new dropzone, the count of the aria label text input fields should update accordingly', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(80);
+            utilities.verifyElementCount(fillInTheGapsOverImageDragAndDropPage.ariaLabelInputField(), 3);
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyAriaLabelTextInputFields(2);
+        });
+
+        it('When the user deletes any dropzone, the count of the aria label texts input fields should update accordingly', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.removeResponseArea(2);
+            utilities.verifyElementCount(fillInTheGapsOverImageDragAndDropPage.ariaLabelInputField(), 2);
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyAriaLabelTextInputFields(0);
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyAriaLabelTextInputFields(1);
+        });
+
+        it('When the user has not set \'ARIA label\' input field, then default aria labels should be present for the dropzones of the specify correct answer section', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelSpecifyCorrectAnswerSection(0, 'dropzone 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelSpecifyCorrectAnswerSection(1, 'dropzone 2');
+        });
+
+        it('When the user sets aria label, then in the dropzones of the specify correct answer section, the aria labels should also update', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.enterTextInAriaLabelInputField(0, 'Add answer for response 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelSpecifyCorrectAnswerSection(0, 'Add answer for response 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelSpecifyCorrectAnswerSection(1, 'dropzone 2');
+        });
+    });
+
+    describe('Additional settings: ARIA label for dropzones - functionality in preview tab', () => {
+        abortEarlySetup();
+        before(() => {
+            fillInTheGapsOverImageDragAndDropPage.steps.navigateToCreateQuestion('fill in the gaps over image with drag and drop');
+            cy.barsPreLoaderWait();
+            fillInTheGapsOverImageDragAndDropPage.steps.uploadFile('highlightImage.jpg');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyImageIsUploaded();
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(10);
+            fillInTheGapsOverImageDragAndDropPage.steps.insertResponseArea(40);
+            fillInTheGapsOverImageDragAndDropPage.steps.addInputToOptionsInputField(options);
+            fillInTheGapsOverImageDragAndDropPage.steps.expandAdditionalSettings();
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToPreviewTab();
+        });
+
+        it('When the user has not set \'ARIA label\' input field, then default aria labels should be present for the dropzones in the preview tab', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelPreviewTab(0, 'dropzone 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelPreviewTab(1, 'dropzone 2');
+        });
+
+        it('When the user has set \'ARIA label\', then it should be present for the dropzones in the preview tab', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToEditTab();
+            fillInTheGapsOverImageDragAndDropPage.steps.enterTextInAriaLabelInputField(0, 'Correct response 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToPreviewTab();
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelPreviewTab(0, 'Correct response 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelPreviewTab(1, 'dropzone 2');
+        });
+
+        it('Accessibility of input field in preview tab when custom \'ARIA label\' is set', { tags: 'a11y' }, () => {
+            cy.checkAccessibility(fillInTheGapsOverImageDragAndDropPage.dropzonePreviewTab().parents('[class*="question-preview-wrapper"]'));
+        });
+
+        it('When the user clears the set value in the \'ARIA label\' input field, then the default aria labels should be present for the dropzones in the preview tab', () => {
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToEditTab();
+            fillInTheGapsOverImageDragAndDropPage.steps.clearTextInAriaLabelInputField(0);
+            fillInTheGapsOverImageDragAndDropPage.steps.switchToPreviewTab();
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelPreviewTab(0, 'dropzone 1');
+            fillInTheGapsOverImageDragAndDropPage.steps.verifyDropzoneAriaLabelPreviewTab(1, 'dropzone 2');
+        });
+    });
+});

package/cypress/e2e/ILC/FillInTheGapsOverImageDragAndDrop/clickAndDrop.js

@@ -157,8 +157,7 @@ describe('Create Item Page: Fill in the gaps over image - drag and drop: Click a
             fillInTheGapsOverImageDragAndDropPage.steps.clickAndDropOptionInOptionsContainerInSpecifyCorrectAnswerSection('Petals');
             fillInTheGapsOverImageDragAndDropPage.steps.clickAndDropOptionInOptionsContainerInSpecifyCorrectAnswerSection('Flower');
             fillInTheGapsOverImageDragAndDropPage.steps.verifyDraggableOptionInOptionsContainerSpecifyCorrectAnswerSection(['Petals', 'Flower', 'Stem', 'Seed']);
-            utilities.verifyInnerText(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 'Error: Please set a correct answer.');
-            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 'notExist');
         });
 
         fillInTheGapsOverImageDragAndDropPage.tests.verifyErrorMessageCSSAndA11y();
@@ -483,13 +482,12 @@ describe('Create Item Page: Fill in the gaps over image - drag and drop: Click a
             fillInTheGapsOverImageDragAndDropPage.steps.verifyInactiveStateOfAllDropzoneInSpecifyCorrectAnswerSection();
         });
 
-        it('When the user selects a filled option and clicks in the options container, the selected option should get back in the options container and \'Error: Please set a correct answer\' error message should be displayed', () => {
+        it('When the user selects a filled option and clicks in the options container, the selected option should get back in the options container and no error message should be displayed', () => {
             fillInTheGapsOverImageDragAndDropPage.steps.clickAndDropGroupedOptionInOptionsContainerInSpecifyCorrectAnswerSection('Petals');
             fillInTheGapsOverImageDragAndDropPage.steps.clickAndDropGroupedOptionInOptionsContainerInSpecifyCorrectAnswerSection('Flower');
             fillInTheGapsOverImageDragAndDropPage.steps.verifyGroupedContainerContentsInSpecifyCorrectAnswerSection(0, groupedOptions[0]);
             fillInTheGapsOverImageDragAndDropPage.steps.verifyGroupedContainerContentsInSpecifyCorrectAnswerSection(1, groupedOptions[1]);
-            utilities.verifyInnerText(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 'Error: Please set a correct answer.');
-            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 'visible');
+            utilities.verifyElementVisibilityState(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 'notExist');
         });
 
         fillInTheGapsOverImageDragAndDropPage.tests.verifyErrorMessageCSSAndA11y();

package/cypress/e2e/ILC/FillInTheGapsOverImageDragAndDrop/draggableOptions.js

@@ -113,7 +113,6 @@ describe('Create Item page - Fill in the gaps over image with drag and drop into
         });
 
         it('When the user clicks on \'Add group\' button without entering text in the option input fields, error message \'Error: Option is required\' should be displayed', () => {
-            fillInTheGapsOverImageDragAndDropPage.steps.addGroup();
             fillInTheGapsOverImageDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(0);
             fillInTheGapsOverImageDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(1);
         });

package/cypress/e2e/ILC/FillInTheGapsOverImageDragAndDrop/headerSection.js

@@ -17,7 +17,7 @@ describe('Create item page - Fill in the gaps over image - drag and drop: Header
         fillInTheGapsOverImageDragAndDropPage.tests.verifyCreateQuestionPageQuestionTypeHeader('Fill in the gaps over image with drag and drop');
     });
 
-    describe('Tabs section', () => { 
+    describe('Tabs section', () => {
         abortEarlySetup();
         before(() => {
             fillInTheGapsOverImageDragAndDropPage.steps.navigateToCreateQuestion('fill in the gaps over image with drag and drop');
@@ -43,16 +43,11 @@ describe('Create item page - Fill in the gaps over image - drag and drop: Header
         });
 
         describe('Validation error messages', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton();
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points', 'Please enter all option', 'Please upload an image', 'Please insert a dropzone']);
 
             it('Validation error messages should be displayed below required input fields', () => {
                 fillInTheGapsOverImageDragAndDropPage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
-                utilities.verifyInnerText(utilities.getNthElement(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 0), 'Error: Image is required.');
-                utilities.verifyInnerText(utilities.getNthElement(fillInTheGapsOverImageDragAndDropPage.errorMessage(), 1), 'Error: Please insert a dropzone.');
-                fillInTheGapsOverImageDragAndDropPage.steps.verifyPointsFieldErrorMessageIsNotDisplayed();
-                fillInTheGapsOverImageDragAndDropPage.steps.verifyOptionsInputFieldErrorMessage(0);
-                fillInTheGapsOverImageDragAndDropPage.steps.verifySpecifyCorrectAnswerErrorIconIsVisible();
-                fillInTheGapsOverImageDragAndDropPage.steps.verifySpecifyCorrectAnswerErrorMessage();
+                fillInTheGapsOverImageDragAndDropPage.steps.verifyWarningIconOnRequiredFields(['Please set points', 'Please enter all option', 'Please upload an image', 'Please insert a dropzone'])
             });
 
             it('Validation error messages should disappear when required input fields are filled', () => {