itemengine-cypress-automation 1.0.93 → 1.0.95

package/cypress/e2e/ILC/Desmos/desmosFourFunctionCalculatorPreviewContents.smoke.js

@@ -19,6 +19,7 @@ describe('Preview tab contents for all views', () => {
                         cy.log('Navigating to passage resource type');
                         desmosToolPage.steps.navigateToCreateResource('desmos four function calculator');
                         desmosToolPage.steps.switchToPreviewTab();
+                        utilities.verifyElementVisibilityState(desmosToolPage.previewTabDesmosToolKeypad(), 'exist');
                         break;
                     case 'Item view':
                         cy.visit(`/item-engine/demo/edit-item/${utilities.base64Encoding(itemReferenceID)}`);

package/cypress/e2e/ILC/Desmos/desmosGeometryToolPreviewContents.smoke.js

@@ -19,6 +19,7 @@ describe('Preview tab contents for all views', () => {
                         cy.log('Navigating to passage resource type');
                         desmosToolPage.steps.navigateToCreateResource('desmos geometry tool');
                         desmosToolPage.steps.switchToPreviewTab();
+                        utilities.verifyElementVisibilityState(desmosToolPage.previewTabDesmosToolSidebarButton(), 'visible');
                         break;
                     case 'Item view':
                         cy.visit(`/item-engine/demo/edit-item/${utilities.base64Encoding(itemReferenceID)}`);

package/cypress/e2e/ILC/Desmos/desmosGraphingCalculatorPreviewContents.smoke.js

@@ -19,6 +19,7 @@ describe('Preview tab contents for all views', () => {
                         cy.log('Navigating to passage resource type');
                         desmosToolPage.steps.navigateToCreateResource('desmos graphing calculator');
                         desmosToolPage.steps.switchToPreviewTab();
+                        utilities.verifyElementVisibilityState(desmosToolPage.previewTabDesmosTextArea(), 'exist');
                         break;
                     case 'Item view':
                         cy.visit(`/item-engine/demo/edit-item/${utilities.base64Encoding(itemReferenceID)}`);

package/cypress/e2e/ILC/Desmos/desmosMatrixCalculatorPreviewContents.smoke.js

@@ -19,6 +19,7 @@ describe('Preview tab contents for all views', () => {
                         cy.log('Navigating to passage resource type');
                         desmosToolPage.steps.navigateToCreateResource('desmos matrix calculator');
                         desmosToolPage.steps.switchToPreviewTab();
+                        utilities.verifyElementVisibilityState(desmosToolPage.previewTabDesmosToolKeypad(), 'exist');
                         break;
                     case 'Item view':
                         cy.visit(`/item-engine/demo/edit-item/${utilities.base64Encoding(itemReferenceID)}`);

package/cypress/e2e/ILC/Desmos/desmosScientificCalculatorPreviewContents.smoke.js

@@ -19,6 +19,7 @@ describe('Preview tab contents for all views', () => {
                         cy.log('Navigating to passage resource type');
                         desmosToolPage.steps.navigateToCreateResource('desmos scientific calculator');
                         desmosToolPage.steps.switchToPreviewTab();
+                        utilities.verifyElementVisibilityState(desmosToolPage.previewTabDesmosToolKeypad(), 'exist');
                         break;
                     case 'Item view':
                         cy.visit(`/item-engine/demo/edit-item/${utilities.base64Encoding(itemReferenceID)}`);

package/cypress/e2e/ILC/DesmosGraphing/editTabBasic.js

@@ -40,6 +40,7 @@ describe('Create Item page - Desmos graphing: Question instructions, edit tab co
         });
 
         it('User should be able to perform actions on the on the \'Graphing calculator\' and should yield expected results', () => {
+            utilities.verifyElementVisibilityState(desmosGraphingPage.previewTabDesmosToolKeypadButton(), 'visible');
             desmosGraphingPage.steps.clickOnDesmosToolKeypadButton();
             desmosGraphingPage.steps.clickOnDesmosToolKeypadKeys('5');
             desmosGraphingPage.steps.clickOnDesmosToolKeypadKeys('Squared');

package/cypress/e2e/ILC/DesmosGraphing/gradingViewAndCorrectAnswerViewContents.smoke.js

@@ -29,6 +29,7 @@ describe('Create item page - Desmos: Grading view, Correct answer view contents'
                     .then(($refID) => {
                         itemReferenceID = $refID;
                         cy.visit(`/item-engine/demo/render-item/student-view/${utilities.base64Encoding(itemReferenceID)}`);
+                        utilities.verifyElementVisibilityState(desmosGraphingPage.previewTabDesmosToolKeypadButton(), 'visible');
                         desmosGraphingPage.steps.clickOnDesmosToolKeypadButton();
                         desmosGraphingPage.steps.clickOnDesmosToolKeypadKeys('5');
                         desmosGraphingPage.steps.clickOnDesmosToolKeypadKeys('Squared');

package/cypress/e2e/ILC/DesmosGraphing/previewTabContent.smoke.js

@@ -19,6 +19,7 @@ describe('Create item page - Desmos graphing: Preview contents', () => {
                         cy.log('Navigating to Fill in the gaps over image - text question type');
                         desmosGraphingPage.steps.navigateToCreateQuestion('Desmos graphing');
                         cy.barsPreLoaderWait();
+                        utilities.verifyElementVisibilityState(desmosGraphingPage.previewTabDesmosToolKeypadButton(), 'visible');
                         desmosGraphingPage.steps.addQuestionInstructions();
                         desmosGraphingPage.steps.clickOnDesmosToolKeypadButton();
                         desmosGraphingPage.steps.clickOnDesmosToolKeypadKeys('5');

package/cypress/e2e/ILC/DesmosGraphing/studentViewSettings.js

@@ -88,6 +88,7 @@ describe('Create Item page - Desmos graphing: Student view settings', () => {
             desmosGraphingPage.steps.switchToEditTab();
             desmosGraphingPage.steps.checkHideExpressionListCheckbox();
             desmosGraphingPage.steps.switchToPreviewTab();
+            utilities.verifyElementVisibilityState(desmosGraphingPage.previewTabDesmosToolKeypadButton(), 'visible');
             desmosGraphingPage.steps.verifyPreviewTabExpressionListPanelHidden();
         });
 
@@ -122,11 +123,11 @@ describe('Create Item page - Desmos graphing: Student view settings', () => {
             desmosGraphingPage.steps.verifyDesmosGraphingHeightInputField('500');
         });
 
-        it('\'Aspect ratio\' and \'Reset dimension\' icons should be displayed and by default aspect ratio should be unlocked and reset dimension should be disabled', () => {
+        it('\'Aspect ratio\' and \'Reset dimension\' icons should be displayed and by default aspect ratio should be unlocked and reset dimension should be enabled', () => {
             utilities.verifyElementVisibilityState(desmosGraphingPage.buttonAspectRatio(), 'visible');
             utilities.verifyElementVisibilityState(desmosGraphingPage.buttonResetDimensions(), 'visible');
             desmosGraphingPage.steps.verifyButtonAspectRatioUnlocked();
-            desmosGraphingPage.steps.verifyButtonResetDimensionsDisabled();
+            desmosGraphingPage.steps.verifyButtonResetDimensionsEnabled();
         });
 
         it('The width and height of the graphing tool should be 500 by 500 pixels', () => {

package/cypress/e2e/ILC/DragAndDropIntoCategoriesNew/Scoring/allOrNothingBasicForGroupedOptionsLayout.js

@@ -12,7 +12,7 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.setGroupedOptions();
         dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
         dragAndDropIntoCategoriesPage.steps.selectOptionFromMaxCapacityPerDropzoneDropdown('4');
-        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Ostrich': 3, 'Whale': 4 });
+        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Tiger': 3, 'Whale': 4 });
         dragAndDropIntoCategoriesPage.steps.allotPoints(20);
         dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
     });
@@ -23,7 +23,7 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.verifyPreviewTabPointsBackgroundForIncorrectOrPartiallyCorrectAnswer();
         dragAndDropIntoCategoriesPage.steps.verifyDropzoneCellNumeration(['1', '2', '3', '4', '5', '6']);
         utilities.verifyInnerText(dragAndDropIntoCategoriesPage.correctAnswersLabel(), 'Correct answers');
-        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Ostrich'], ['Whale']], ['1', '2', '3', '4', '5']);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Tiger'], ['Whale']], ['1', '2', '3', '4', '5']);
     });
 
     it('When the user attempts the question incorrectly, then the user should be awarded 0 points and on switching to \'Grading\' view, incorrect icons should be displayed besides all incorrect responses, a status message with text \'Your answer is incorrect\' and correct answer section with all correct answers along with dropzone cell numeration should be displayed', () => {
@@ -33,7 +33,7 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.switchToGradingView();
         dragAndDropIntoCategoriesPage.steps.verifyIncorrectOptionIcon(0);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectIncorrectAnswerLabel('incorrect');
-        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Ostrich'], ['Whale']], ['1', '2', '3', '4', '5']);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Tiger'], ['Whale']], ['1', '2', '3', '4', '5']);
     });
 
     it('When the user attempts the question partially correct with some cells correct, some cells partially correct but incomplete, some cells partially correct with incorrect options, then the user should be awarded 0 points and on switching to \'Grading\' view, correct icon should be displayed besides the correct answer responses, incorrect icon should be displayed besides incorrect answer response, a status message with text \'Your answer is incorrect\' and correct answer section with all correct answers along with dropzone cell numeration should be displayed', () => {
@@ -46,12 +46,12 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.verifyIncorrectOptionIcon(2);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(3);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectIncorrectAnswerLabel('incorrect');
-        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Ostrich'], ['Whale']], ['1', '2', '3', '4', '5']);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Tiger'], ['Whale']], ['1', '2', '3', '4', '5']);
     });
 
     it('When the user attempts the question partially correct with all the cells correctly attempted but one cell incomplete, then the user should be awarded 0 points and on switching to \'Grading\' view, correct icon should be displayed besides the correct answer responses, incorrect icon should be displayed besides incorrect answer response, a status message with text \'Your answer is incorrect\' and correct answer section with all correct answers along with dropzone cell numeration should be displayed', () => {
         dragAndDropIntoCategoriesPage.steps.resetQuestionPreview();
-        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Platypus': 2, 'Ostrich': 3, 'Whale': 4 })
+        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Platypus': 2, 'Tiger': 3, 'Whale': 4 })
         dragAndDropIntoCategoriesPage.steps.verifyPreviewScore(0, 20);
         dragAndDropIntoCategoriesPage.steps.switchToGradingView();
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(0);
@@ -60,12 +60,12 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(3);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(4);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectIncorrectAnswerLabel('incorrect');
-        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Ostrich'], ['Whale']], ['1', '2', '3', '4', '5']);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Tiger'], ['Whale']], ['1', '2', '3', '4', '5']);
     });
 
     it('When the user attempts the question partially correct with all the cells correctly attempted but with an extra option which is not set as correct answer, then the user should be awarded 0 points and on switching to \'Grading\' view, correct icon should be displayed besides the correct answer responses, incorrect icon should be displayed besides incorrect answer response, a status message with text \'Your answer is incorrect\' and correct answer section should not be displayed', () => {
         dragAndDropIntoCategoriesPage.steps.resetQuestionPreview();
-        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Ostrich': 3, 'Whale': 4, 'Flying squirrel': 4 });
+        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Tiger': 3, 'Whale': 4, 'Flying squirrel': 4 });
         dragAndDropIntoCategoriesPage.steps.verifyPreviewScore(0, 20);
         dragAndDropIntoCategoriesPage.steps.switchToGradingView();
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(0);
@@ -82,8 +82,8 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
     //Need to check once https://redmine.zeuslearning.com/issues/558925 is resolved
     it('When the user attempts question with the common option from another group and all other correct options then the user should be awarded 0 points and on switching to \'Grading\' view, incorrect icon should be displayed besides incorrect answer response, a status message with text \'Your answer is incorrect\' and correct answer section should be displayed along with numeration', () => {
         dragAndDropIntoCategoriesPage.steps.resetQuestionPreview();
-        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionFromNthGroupInDropzonePreviewTab(3, { 'Bat': 0 })
-        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Ostrich': 3, 'Whale': 4 });
+        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionFromNthGroupInDropzonePreviewTab(3, { optionText: 'Bat', dropzoneIndex: 0 })
+        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Tiger': 3, 'Whale': 4 });
         dragAndDropIntoCategoriesPage.steps.verifyPreviewScore(0, 20);
         dragAndDropIntoCategoriesPage.steps.switchToGradingView();
         dragAndDropIntoCategoriesPage.steps.verifyIncorrectOptionIcon(0);
@@ -92,8 +92,8 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(3);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(4);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(5);
-        dragAndDropIntoCategoriesPage.steps.verifyIncorrectOptionIcon(6);
-        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Ostrich'], ['Whale']], ['1', '2', '3', '4', '5']);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(6);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerResponsesInCorrectAnswerSectionAndCount([['Bat'], ['Eagle', 'Parrot'], ['Platypus'], ['Tiger'], ['Whale']], ['1', '2', '3', '4', '5']);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectIncorrectAnswerLabel('incorrect');
         dragAndDropIntoCategoriesPage.steps.verifyQuestionPreviewStateWhenSwitchingBackToStudentView();
         cy.log('When the user attempts the question with the common option from another group then the user should be awarded and clicks on \'Check answer\' button, incorrect icon should be displayed besides incorrect answer response, a status message with text \'Your answer is incorrect\' should be displayed and correct answer section should not be displayed')
@@ -104,14 +104,14 @@ describe('Create Item page - drag and drop into categories: All or nothing scori
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(3);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(4);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(5);
-        dragAndDropIntoCategoriesPage.steps.verifyIncorrectOptionIcon(6);
+        dragAndDropIntoCategoriesPage.steps.verifyCorrectOptionIcon(6);
         dragAndDropIntoCategoriesPage.steps.verifyCorrectIncorrectAnswerLabel('incorrect');
         dragAndDropIntoCategoriesPage.steps.verifyCorrectAnswerSectionNotExists();
     });
 
     it('When user attempts the question correctly, the user should be awarded full points and on switching to \'Grading\' view, then correct icons should be displayed beside all the correct responses, correct icon should be displayed besides the correct answer responses, a status message with text \'Your answer is correct\' and correct answer section should not be displayed', () => {
         dragAndDropIntoCategoriesPage.steps.resetQuestionPreview();
-        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Ostrich': 3, 'Whale': 4 });
+        dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Bat': 0, 'Eagle': 1, 'Parrot': 1, 'Platypus': 2, 'Tiger': 3, 'Whale': 4 });
         dragAndDropIntoCategoriesPage.steps.verifyPreviewScore(20, 20);
         dragAndDropIntoCategoriesPage.steps.switchToGradingView();
         dragAndDropIntoCategoriesPage.steps.verifyPreviewTabPointsBackgroundForCorrectAnswer();

package/cypress/e2e/ILC/DragAndDropIntoCategoriesNew/Scoring/perCorrectOptionMinimumAndPenaltyScoring.js

@@ -21,7 +21,6 @@ describe('Create item page - Drag and drop into categories: Per correct option s
             dragAndDropIntoCategoriesPage.steps.selectAutoScoredScoringSubtype('Per correct option');
             dragAndDropIntoCategoriesPage.steps.allotPoints(5);
             dragAndDropIntoCategoriesPage.steps.checkAllowStudentToCheckAnswerCheckbox();
-            dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
         });
 
         //Penalty points for the entire question
@@ -108,7 +107,6 @@ describe('Create item page - Drag and drop into categories: Per correct option s
             dragAndDropIntoCategoriesPage.steps.selectAutoScoredScoringSubtype('Per correct option');
             dragAndDropIntoCategoriesPage.steps.allotPoints(1);
             dragAndDropIntoCategoriesPage.steps.checkAllowStudentToCheckAnswerCheckbox();
-            dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
         });
 
         it('When the user selects \'Award minimum score\' from the minimum scoring dropdown, does not attempt the question and switches to grading view, then the user should be awarded with minimum points', () => {
@@ -172,7 +170,6 @@ describe('Create item page - Drag and drop into categories: Per correct option s
             dragAndDropIntoCategoriesPage.steps.selectAutoScoredScoringSubtype('Per correct option');
             dragAndDropIntoCategoriesPage.steps.allotPoints(1.65);
             dragAndDropIntoCategoriesPage.steps.checkAllowStudentToCheckAnswerCheckbox();
-            dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
         });
 
         it('When the user sets \'Rounding\' to \'Round down if <=0.99\', attempts the question partially correct with an option such that points of the correctly attempted options has decimal value greater than 0.5 and less than 0.99, then the points awarded should be rounded down to the nearest integer value', () => {

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

@@ -328,10 +328,10 @@ describe('Create Item page - drag and drop into categories: Student view setting
             dragAndDropIntoCategoriesPage.steps.allotPoints(5);
         });
 
-        it('\'Maximum capacity per dropzone\' label and dropdown should be displayed. By default the \'1\' should be the selected option in the \'Maximum capacity per dropzone\' dropdown', () => {
+        it('\'Maximum capacity per dropzone\' label and dropdown should be displayed. By default the \'None\' should be the selected option in the \'Maximum capacity per dropzone\' dropdown', () => {
             utilities.verifyInnerText(dragAndDropIntoCategoriesPage.maxCapacityPerDropzoneLabel(), 'Maximum capacity per dropzone');
             utilities.verifyElementVisibilityState(dragAndDropIntoCategoriesPage.maxCapacityPerDropzoneLabel(), 'visible');
-            utilities.verifyInnerText(dragAndDropIntoCategoriesPage.maxCapacityPerDropzoneDropdown(), '1');
+            utilities.verifyInnerText(dragAndDropIntoCategoriesPage.maxCapacityPerDropzoneDropdown(), 'None');
         });
 
         it(`When the user expands the \'Maximum capacity per dropzone\' dropdown, a list of ${defaultListOptions.length} options - ${defaultListOptions.join(',')} should be displayed`, () => {
@@ -346,10 +346,10 @@ describe('Create Item page - drag and drop into categories: Student view setting
                 'font-size': css.fontSize.default,
                 'font-weight': css.fontWeight.regular,
                 'background-color': css.color.liTextSelectedBg
-            })
+            });
             utilities.verifyCSS(dragAndDropIntoCategoriesPage.maxCapacityPerDropzoneDropdownListOptions(defaultListOptions[0]), {
                 'background-color': css.color.transparent
-            })
+            });
         });
 
         it('Accessibility of \'Maximum capacity per dropzone\' dropdown in active state', { tags: 'a11y' }, () => {
@@ -363,7 +363,7 @@ describe('Create Item page - drag and drop into categories: Student view setting
             dragAndDropIntoCategoriesPage.steps.verifyMaxCapacityPerDropzoneListOptions(['None', '1', '2', '3', '4', '5', '6', '7']);
         });
 
-        it('When the user selects \'None\' from the \'Maximum capacity per dropzone\' dropdown, then the user should be able to set n number of options in a dropzone in the specify correct answer section', () => {
+        it('When the user selects a finite number of options value from the \'Maximum capacity per dropzone\' dropdown, then the user should only be able to set options in a dropzone in the specify correct answer section according to the selected option', () => {
             cy.log('Pre step: Adding input to the empty options input field')
             dragAndDropIntoCategoriesPage.steps.enterTextInOptionInputField(2, 'Whale');
             dragAndDropIntoCategoriesPage.steps.enterTextInOptionInputField(3, 'Parrot');
@@ -371,13 +371,6 @@ describe('Create Item page - drag and drop into categories: Student view setting
             dragAndDropIntoCategoriesPage.steps.enterTextInOptionInputField(5, 'Ostrich');
             dragAndDropIntoCategoriesPage.steps.enterTextInOptionInputField(6, 'Squirrel');
 
-            dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
-            dragAndDropIntoCategoriesPage.steps.selectOptionFromMaxCapacityPerDropzoneDropdown('None');
-            dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Parrot': 1, 'Ostrich': 1, 'Whale': 1 });
-            dragAndDropIntoCategoriesPage.steps.verifyDraggableOptionInDropzoneOfSpecifyCorrectAnswerSection(1, ['Parrot', 'Ostrich', 'Whale']);
-        });
-
-        it('When the user selects a finite number of options value from the \'Maximum capacity per dropzone\' dropdown, then the user should only be able to set options in a dropzone in the specify correct answer section according to the selected option', () => {
             dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
             dragAndDropIntoCategoriesPage.steps.selectOptionFromMaxCapacityPerDropzoneDropdown('2');
             dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Bat': 0, 'Eagle': 0, 'Squirrel': 0 });
@@ -416,10 +409,16 @@ describe('Create Item page - drag and drop into categories: Student view setting
         it('Accessibility of \'Show students the dropzone limits\' checkbox - checked state', { tags: 'a11y' }, () => {
             cy.checkAccessibility(dragAndDropIntoCategoriesPage.showStudentsDropzoneLimitsCheckbox().parents('[data-ngie-testid="show-students-the-dropzone-limits-checkbox"]'));
         });
+
+        it('When the user selects \'None\' from the \'Maximum capacity per dropzone\' dropdown, then the user should be able to set n number of options in a dropzone in the specify correct answer section', () => {
+            dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
+            dragAndDropIntoCategoriesPage.steps.selectOptionFromMaxCapacityPerDropzoneDropdown('None');
+            dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzoneSpecifyCorrectAnswerSection({ 'Parrot': 1, 'Ostrich': 1, 'Whale': 1 });
+            dragAndDropIntoCategoriesPage.steps.verifyDraggableOptionInDropzoneOfSpecifyCorrectAnswerSection(1, ['Parrot', 'Ostrich', 'Whale']);
+        });
     });
 
     describe('Maximum capacity per dropzone and Show students the dropzone limits: Preview tab', () => {
-        const defaultListOptions = ['None', '1', '2']
         abortEarlySetup();
         before(() => {
             dragAndDropIntoCategoriesPage.steps.navigateToCreateQuestion('drag and drop into categories');
@@ -429,14 +428,6 @@ describe('Create Item page - drag and drop into categories: Student view setting
             dragAndDropIntoCategoriesPage.steps.allotPoints(5);
         });
 
-        it('When the user selects \'None\' from the \'Maximum capacity per dropzone\' dropdown, then the user should be able to set n number of options in a dropzone in the preview tab', () => {
-            dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
-            dragAndDropIntoCategoriesPage.steps.selectOptionFromMaxCapacityPerDropzoneDropdown('None');
-            dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
-            dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Parrot': 1, 'Ostrich': 1, 'Whale': 1 });
-            dragAndDropIntoCategoriesPage.steps.verifyDraggableOptionInDropzoneOfPreviewTab(1, ['Parrot', 'Ostrich', 'Whale']);
-        });
-
         it('When the user selects a finite number of options value from the \'Maximum capacity per dropzone\' dropdown, then the user should only be able to drop options in a dropzone in the preview tab according to the selected option', () => {
             dragAndDropIntoCategoriesPage.steps.switchToEditTab();
             dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
@@ -456,5 +447,14 @@ describe('Create Item page - drag and drop into categories: Student view setting
             dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
             utilities.verifyInnerText(dragAndDropIntoCategoriesPage.maxLimitInEachDropzoneHelpText(), 'Maximum answers in each dropzone:\n2');
         });
+
+        it('When the user selects \'None\' from the \'Maximum capacity per dropzone\' dropdown, then the user should be able to set n number of options in a dropzone in the preview tab', () => {
+            dragAndDropIntoCategoriesPage.steps.switchToEditTab();
+            dragAndDropIntoCategoriesPage.steps.expandMaxCapacityPerDropzoneDropdown();
+            dragAndDropIntoCategoriesPage.steps.selectOptionFromMaxCapacityPerDropzoneDropdown('None');
+            dragAndDropIntoCategoriesPage.steps.switchToPreviewTab();
+            dragAndDropIntoCategoriesPage.steps.clickAndDropOptionInDropzonePreviewTab({ 'Parrot': 1, 'Ostrich': 1, 'Whale': 1 });
+            dragAndDropIntoCategoriesPage.steps.verifyDraggableOptionInDropzoneOfPreviewTab(1, ['Parrot', 'Ostrich', 'Whale']);
+        });
     });
 });

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

@@ -74,9 +74,7 @@ describe('Create Item page - drag and drop into categories: Student view setting
             groupTitleArray.forEach((groupTitle, groupIndex) => {
                 dragAndDropIntoCategoriesPage.steps.verifyGroupedOptionsTitlePreviewTab(groupIndex, groupTitle);
             });
-            animals.forEach((options, index) => {
-                dragAndDropIntoCategoriesPage.steps.verifyGroupedContainerContentsInPreviewTab(index, options);
-            });
+            dragAndDropIntoCategoriesPage.steps.verifyDraggableOptionsInOptionsContainerPreviewTab(optionsArray);
         });
 
         it('When the user switches to \'Edit tab\' and modifies any of question properties, then the order of group containers as well as the options inside the group should change', () => {

package/cypress/e2e/ILC/DrawingResponse/drawingResponseAdditionalSettings.js

@@ -5,7 +5,7 @@ import utilities from "../../../support/helpers/utilities";
 const css = Cypress.env('css');
 const defaultStrokeLineThicknessOptions = ['5px', '10px', '15px', '20px', '25px'];
 const thickness = ['5', '10', '15', '20', '25'];
-const lineTypeOptions = ['Line', 'Dashed', 'Dotted', 'Single Arrow', 'Double Arrow'];
+const lineTypeOptions = ['basic line', 'dashed line', 'dotted line', 'single arrow line', 'double arrow line'];
 const fontSizeDropdownOptions = ['Tiny', 'Small', 'Default', 'Normal', 'Big', 'Huge'];
 const fontSizes = ['12px', '14px', '16px', '18px', '22px', '26px'];
 const lineTypeOptionsTooltip = ['Line', 'Dashed', 'Dotted', 'Single arrow', 'Double arrow'];
@@ -94,7 +94,7 @@ describe('Drawing response - Additional settings', () => {
                 'border': `1px solid ${css.color.figDefaultComponentBorder}`
             });
             cy.log('Css of stroke color');
-            utilities.verifyCSS(drawingResponsePage.additionalSettingsStrokeImage().eq(0).find('[data-name="Stroke Thickness 5px]'), {
+            utilities.verifyCSS(drawingResponsePage.additionalSettingsStrokeImage().eq(0).find('[data-name="Stroke Thickness 5px"]'), {
                 'fill': css.color.tooltipBg
             });
             cy.log('Css of selected icon');
@@ -108,7 +108,6 @@ describe('Drawing response - Additional settings', () => {
         });
     });
 
-    //Failing due to https://redmine.zeuslearning.com/issues/555345
     describe('Additional settings: Default stroke/line thickness - Preview tab', () => {
         abortEarlySetup();
         before(() => {
@@ -120,7 +119,7 @@ describe('Drawing response - Additional settings', () => {
         });
 
         it('When the stroke/line thickness is set to 5px by default then the stroke thickness in secondary toolbar should be also be set to 5px in the preview tab', () => {
-            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Line thickness');
+            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Stroke thickness');
             drawingResponsePage.steps.verifySelectedOptionFromSecondaryOptionPopup(0);
         });
 
@@ -130,7 +129,7 @@ describe('Drawing response - Additional settings', () => {
             drawingResponsePage.steps.selectStrokeLineThicknessTypeOption(defaultStrokeLineThicknessOptions[1]);
             drawingResponsePage.steps.switchToPreviewTab();
             drawingResponsePage.steps.selectPreviewTabToolbarOption('Line');
-            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Line thickness');
+            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Stroke thickness');
             drawingResponsePage.steps.verifySelectedOptionFromSecondaryOptionPopup(1);
         });
     });
@@ -202,7 +201,6 @@ describe('Drawing response - Additional settings', () => {
         });
     });
 
-    //Failing due to https://redmine.zeuslearning.com/issues/555345
     describe('Additional settings: Set line type - Preview tab', () => {
         abortEarlySetup();
         before(() => {
@@ -214,7 +212,7 @@ describe('Drawing response - Additional settings', () => {
         });
 
         it('When all line type buttons are selected by default then all the line type options should be displayed in secondary toolbar in the preview tab', () => {
-            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Line Type');
+            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Line type');
             lineTypeOptions.forEach((lineType, index) => {
                 drawingResponsePage.steps.verifySecondaryPopupLineType(lineType, index)
             });

package/cypress/e2e/ILC/DrawingResponse/drawingResponseBackground.js

@@ -3,7 +3,7 @@ import abortEarlySetup from "../../../support/helpers/abortEarly";
 import utilities from "../../../support/helpers/utilities";
 
 const css = Cypress.env('css');
-const defaultToolbarAndControlOptions = ['Select', 'Pencil', 'Line', 'Curved Line', 'Take a photo', 'Upload an image', 'Text', 'Point Eraser', 'Bring forward', 'Bring backward', 'Duplicate', 'Undo', 'Redo', 'Full Screen', 'Clear All'];
+const defaultToolbarAndControlOptions = ['Select', 'Scribble', 'Line', 'Curved line', 'Capture image', 'Insert image', 'Text', 'Point eraser', 'Bring to front', 'Sent to back', 'Duplicate', 'Undo', 'Redo', 'Full screen', 'Clear all'];
 const patterns = ['Grid', 'Lines', 'Dots', 'Circular', 'Graph', 'Quadrant'];
 const orientationOptions = ['Portrait', 'Landscape', 'Square'];
 const imageAlternativeText = ['Grid pattern of evenly spaced horizontal and vertical lines', 'Line pattern of evenly spaced horizontal lines', 'Dot pattern of evenly spaced horizontal and vertical dots', 'Circular pattern of evenly spaced concentric circles', 'Graph pattern of evenly spaced horizontal and vertical lines', 'Quadrant pattern of evenly spaced horizontal and vertical lines'];
@@ -143,9 +143,9 @@ describe('Create item page - Drawing response: Background: Blank canvas, Image,
                 .verifyTooltip('Locked aspect ratio');
         });
 
-        it('When the user hovers over the \'Reset image size\' button, a tooltip \'Reset image size\' should be displayed and on moving away the focus, the tooltip should disappear', () => {
+        it('When the user hovers over the \'Reset canvas size\' button, a tooltip \'Reset canvas size\' should be displayed and on moving away the focus, the tooltip should disappear', () => {
             drawingResponsePage.resetDimensionsButton()
-                .verifyTooltip('Reset image size');
+                .verifyTooltip('Reset canvas size');
         });
 
         it('Accessibility of enabled reset dimension button', { tags: 'a11y' }, () => {

package/cypress/e2e/ILC/DrawingResponse/drawingResponseCustomizeAdditionalOptions.js

@@ -15,7 +15,7 @@ describe('Create item page - Drawing response: Customize special characters, Cus
     before(() => {
         cy.loginAs('admin');
     });
-    
+
     describe('Customize special characters', () => {
         abortEarlySetup();
         before(() => {
@@ -442,16 +442,19 @@ describe('Create item page - Drawing response: Customize special characters, Cus
         });
 
         it('When the user has modified contents in the \'Stroke/font color\' section in the edit tab, the updates should be displayed in the \'Stroke/font color\' popup in the preview tab', () => {
+            cy.log('Pre-step: Selecting polygon toolbar option')
+            drawingResponsePage.steps.selectToolbarOptionsAndControlsFormattingOptionsTiles([`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[11].displayName}`]);
             drawingResponsePage.steps.switchToPreviewTab();
-            drawingResponsePage.steps.selectPreviewTabToolbarOption(`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[1].displayName}`);
-            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Stroke Color');
+            drawingResponsePage.steps.selectPreviewTabToolbarOption(`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[11].displayName}`);
+            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Stroke color');
             drawingResponsePage.steps.verifyCSSOfSecondaryOptionPopupOptions(0, 'rgb(255, 0, 0)');
             drawingResponsePage.steps.verifyCSSOfSecondaryOptionPopupOptions(1, 'rgb(0, 133, 89)');
             drawingResponsePage.steps.verifyCSSOfSecondaryOptionPopupOptions(2, 'rgb(128, 25, 0)');
             drawingResponsePage.steps.verifyNoColorOptionFromSecondaryOptionPopup(3);
-            cy.log('Post-step: Closing stroke color color popup and switching to edit tab');
+            cy.log('Post-step: Closing stroke color color popup, switching to edit tab and deselecting polygon toolbar option');
             drawingResponsePage.steps.closeSecondaryPopup();
             drawingResponsePage.steps.switchToEditTab();
+            drawingResponsePage.steps.deselectToolbarOptionsAndControlsFormattingOptionsTiles([`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[11].displayName}`]);
         });
 
         it('When the user adds upto 10 color blocks, then the add[+] color block should get disabled when 10 blocks have been added.', () => {
@@ -542,7 +545,7 @@ describe('Create item page - Drawing response: Customize special characters, Cus
             drawingResponsePage.steps.navigateToCreateQuestion('Drawing Response');
             cy.barsPreLoaderWait();
             drawingResponsePage.steps.expandCustomizeToolbarOptionsAndControlsAccordion();
-            drawingResponsePage.steps.selectToolbarOptionsAndControlsFormattingOptionsTiles([`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[11].displayName}}`]);
+            drawingResponsePage.steps.selectToolbarOptionsAndControlsFormattingOptionsTiles([`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[11].displayName}`]);
         });
 
         it('When the \'Fill color\' is not selected in the additional options section, \'Default fill colors\' label should be displayed along with a color block with color - \'#00E0FF\'', () => {
@@ -625,7 +628,7 @@ describe('Create item page - Drawing response: Customize special characters, Cus
         it('When the user has modified contents in the \'Fill color\' section in the edit tab, the updates should be displayed in the \'Fill color\' popup in the preview tab', () => {
             drawingResponsePage.steps.switchToPreviewTab();
             drawingResponsePage.steps.selectPreviewTabToolbarOption(`${drawingToolbarOptionsAndAdditionalOptions.drawingToolbarOptions[11].displayName}`);
-            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Fill Color');
+            drawingResponsePage.steps.selectPreviewTabSecondaryToolbarOption('Fill color');
             drawingResponsePage.steps.verifyCSSOfSecondaryOptionPopupOptions(0, 'rgb(255, 0, 0)');
             drawingResponsePage.steps.verifyCSSOfSecondaryOptionPopupOptions(1, 'rgb(6, 255, 172)');
             drawingResponsePage.steps.verifyCSSOfSecondaryOptionPopupOptions(2, 'rgb(255, 90, 51)');

package/cypress/e2e/ILC/DrawingResponse/drawingResponseEditTabBasicSection.js

@@ -61,7 +61,8 @@ describe('Create item page - Drawing response: Question instructions, Customize
             utilities.verifyElementVisibilityState(drawingResponsePage.toolBarOptionsLabel(), 'visible');
         });
 
-        it(`A total of ${toolbarOptions.length} toolbar options should be displayed in the \'Toolbar options\' section. By default, first ${toolbarOptions.slice(0, 8).length} toolbar options should be selected in the \'Toolbar options\' section`, () => {
+        //TODO- Update as per https://redmine.zeuslearning.com/issues/560558
+        it(`A total of ${toolbarOptions.length} toolbar options should be displayed in the \'Toolbar options\' section. By default, first 8 toolbar options should be selected in the \'Toolbar options\' section`, () => {
             toolbarOptions.forEach((toolbarOption) => {
                 utilities.verifyElementVisibilityState(drawingResponsePage.toolbarOptionsAndControlsFormattingOptionsTiles(toolbarOption.displayName), 'visible');
             });
@@ -86,7 +87,7 @@ describe('Create item page - Drawing response: Question instructions, Customize
 
         it('When user deselects all control options, then error message should not be displayed', () => {
             controlsOptions.forEach((controlsOption) => {
-                drawingResponsePage.steps.unselectToolbarOptionsAndControlsFormattingOptionsTiles(controlsOption);
+                drawingResponsePage.steps.deselectToolbarOptionsAndControlsFormattingOptionsTiles(controlsOption);
             });
             commonComponents.steps.verifyErrorMessageIsNotDisplayed();
         });
@@ -97,7 +98,7 @@ describe('Create item page - Drawing response: Question instructions, Customize
 
         it('When user deselects all toolbar options, then an error message should be displayed - \'Error: Please select a Toolbar option.\'', () => {
             toolbarOptions.forEach((toolbarOption) => {
-                drawingResponsePage.steps.unselectToolbarOptionsAndControlsFormattingOptionsTiles(toolbarOption.displayName);
+                drawingResponsePage.steps.deselectToolbarOptionsAndControlsFormattingOptionsTiles(toolbarOption.displayName);
             });
             utilities.verifyInnerText(commonComponents.errorMessage(), 'Error: Please select a Toolbar option.');
         });
@@ -175,7 +176,7 @@ describe('Create item page - Drawing response: Question instructions, Customize
         });
 
         it(`By default ${drawingToolbarOptionsAndAdditionalOptions.additionalOptionsTooltip.slice(0, 5).join(' ')} additional options should be displayed in the Additional options section`, () => {
-            drawingToolbarOptionsAndAdditionalOptions.additionalOptionsTooltip.slice(0, 5).forEach((additionalOption) => {
+            drawingToolbarOptionsAndAdditionalOptions.additionalOptions.slice(0, 5).forEach((additionalOption) => {
                 utilities.verifyElementVisibilityState(drawingResponsePage.additionalOptionsTiles(additionalOption), 'visible');
             });
         });
@@ -220,7 +221,7 @@ describe('Create item page - Drawing response: Question instructions, Customize
         it('When user selects a toolbar option, then its corresponding secondary toolbar options and their customization options and their sections should be displayed', () => {
             cy.log('Pre-step: De-select all toolbar options');
             toolbarOptions.forEach((toolbarOption) => {
-                drawingResponsePage.steps.unselectToolbarOptionsAndControlsFormattingOptionsTiles(toolbarOption.displayName);
+                drawingResponsePage.steps.deselectToolbarOptionsAndControlsFormattingOptionsTiles(toolbarOption.displayName);
             });
             toolbarOptions.forEach((toolbarOption) => {
                 drawingResponsePage.steps.selectEditTabToolbarOptions([`${toolbarOption.displayName}`]);
@@ -272,7 +273,7 @@ describe('Create item page - Drawing response: Question instructions, Customize
                     utilities.verifyElementVisibilityState(drawingResponsePage.customizeMathCharactersLabel(), 'notExist');
                 }
 
-                drawingResponsePage.steps.unselectToolbarOptionsAndControlsFormattingOptionsTiles(`${toolbarOption.displayName}`);
+                drawingResponsePage.steps.deselectToolbarOptionsAndControlsFormattingOptionsTiles(`${toolbarOption.displayName}`);
             });
         });
 

package/cypress/e2e/ILC/DrawingResponse/drawingResponseGradingViewAndCorrectAnswerViewContents.smoke.js

@@ -1,4 +1,4 @@
-import { correctAnswerViewPage, drawingResponsePage, itemPreviewPage, studentViewPage } from "../../../pages";
+import { correctAnswerViewPage, desmosGraphingPage, drawingResponsePage, itemPreviewPage, studentViewPage } from "../../../pages";
 import { gradingViewPage } from "../../../pages";
 import abortEarlySetup from "../../../support/helpers/abortEarly";
 import utilities from "../../../support/helpers/utilities";

package/cypress/e2e/ILC/DrawingResponse/drawingResponsePageHeaderSection.js

@@ -14,7 +14,7 @@ describe('Create item page - Drawing Response: Header section and Saving questio
             cy.barsPreLoaderWait();
         });
 
-        drawingResponsePage.tests.verifyCreateQuestionPageQuestionTypeHeader('Drawing Response');
+        drawingResponsePage.tests.verifyCreateQuestionPageQuestionTypeHeader('Drawing response');
     });
 
     describe('Tabs section', () => {