itemengine-cypress-automation 1.0.342-save-as-you-go-updates-184015f.0 → 1.0.343-IEI-5600-IEI-5708-9440b5e.0

package/cypress/e2e/ILC/ThinkSphere/studentViewReviewTabSection.js

@@ -0,0 +1,141 @@
+import uuid from 'react-uuid';
+import { thinkSpherePage } from "../../../pages";
+import { browseItemsPage } from "../../../pages/components/browseItemsPage";
+import { commonComponents } from "../../../pages/components/commonComponents";
+import abortEarlySetup from "../../../support/helpers/abortEarly";
+import utilities from "../../../support/helpers/utilities";
+const css = Cypress.env('css');
+
+describe('Student view : ThinkSphere Question - Review Section', () => {
+    const uuidString = uuid();
+
+    before(() => {
+        cy.loginAs('admin');
+        cy.createThinkSphereItem(uuidString, true);
+        thinkSpherePage.steps.visitThinksphereBrowseItemsPage();
+        browseItemsPage.steps.clickOnItemReferenceId(uuidString);
+        browseItemsPage.steps.clickOnAddReviewItem();
+        thinkSpherePage.steps.createReviewQuestion();
+        thinkSpherePage.steps.visitThinksphereBrowseItemsPage();
+        browseItemsPage.steps.clickOnActionButton();
+        browseItemsPage.steps.clickOnActionMenuItem(0);
+        thinkSpherePage.steps.clickOnReviewTab();
+    });
+
+    describe('\'Question instruction\' section', () => {
+        abortEarlySetup();
+        it('\'Question instruction\' section should be present', () => {
+            thinkSpherePage.steps.verifyQuestionInstructionPreviewTexWrapperVisibility('question instruction text');
+        });
+
+        it('CSS of \'Question instruction\' section', { tags: 'css' }, () => {
+            utilities.verifyCSS(thinkSpherePage.questionInstructionPreviewTexWrapper(), {
+                'border-radius': '12px',
+                'background-color': css.color.questionInstructionBG,
+                'padding': '10px 170px 10px 27px',
+                'font-size': css.fontSize.default,
+                'font-weight': css.fontWeight.regular,
+            });
+        });
+
+        it('Question instruction image should visibile in the preview', () => {
+            thinkSpherePage.steps.verifyQuestionInstructionPreviewImageWrapperVisibility();
+        });
+
+        it('CSS of question instruction image section', { tags: 'css' }, () => {
+            utilities.verifyCSS(thinkSpherePage.questionInstructionPreviewImageWrapper(), {
+                'width': '143px',
+                'height': '110px',
+                'border': `1px solid ${css.color.secondaryBtnBorder}`,
+                'background-color': css.color.primaryBtn,
+            });
+            utilities.verifyCSS(thinkSpherePage.questionInstructionPreviewImageExpandButton(), {
+                'width': '24px',
+                'height': '24px',
+                'box-shadow': `${css.color.boxShadow} 0px 2px 8px 0px`,
+                'border': `1px solid ${css.color.figDefaultComponentBorder}`,
+                'border-radius': '4px',
+                'background-color': css.color.primaryBtn,
+            });
+        });
+
+        it('When user clicks on expand question instruction image then it should open in the popup', () => {
+            thinkSpherePage.steps.clickOnQuestionInstructionExpandImageButton();
+            utilities.verifyElementVisibilityState(thinkSpherePage.dialogBoxRoot(), 'visible');
+            thinkSpherePage.steps.verifyQuestionImagePopup();
+        });
+
+        it('CSS of question instruction image popup', { tags: 'css' }, () => {
+            utilities.verifyCSS(thinkSpherePage.dialogBoxRoot(), {
+                'border-radius': '8px',
+                'border': `1px solid ${css.color.secondaryBtnBorder}`,
+                'box-shadow': `${css.color.dialogBoxBoxShadow} 0px 0px 10px 0px`,
+            });
+            utilities.verifyCSS(thinkSpherePage.closeExpandImagePopupButton(), {
+                'background-color': css.color.primaryBtn,
+                'font-size': css.fontSize.normal,
+                'font-weight': css.fontWeight.semibold,
+                'border': `1px solid ${css.color.secondaryBtnBorder}`,
+                'color': css.color.primaryBtnBorder,            
+            });
+        });
+
+        it('When user clicks on close expand image popup button then it should remove the popup', () => {
+            thinkSpherePage.steps.clickOnCloseExpandImagePopupButton();
+            utilities.verifyElementVisibilityState(thinkSpherePage.dialogBoxRoot(), 'notExist');
+        });
+    });
+
+    describe('\'Check your math\' section', () => {
+        abortEarlySetup();
+        it('\'Check your math\' section header should be present', () => {
+            utilities.verifyElementVisibilityState(thinkSpherePage.checkYourMathHeading(), 'visible');
+            utilities.verifyInnerText(thinkSpherePage.checkYourMathHeading(), 'Check your math');
+        });
+
+        it('CSS of \'Check your math\' section header', { tags: 'css' }, () => {
+            utilities.verifyCSS(thinkSpherePage.checkYourMathHeading(), {
+                'color': css.color.primaryBtnBorder,
+                'font-size': css.fontSize.heading,
+                'font-weight': css.fontWeight.semibold,
+            });
+        });
+        
+        it('\'The problem is asking me to\' section header should be present', () => {
+            utilities.verifyElementVisibilityState(thinkSpherePage.problemAskingToMeTextWrapper(), 'visible');
+            utilities.verifyInnerText(thinkSpherePage.problemAskingToMeTextWrapper(), 'The problem is asking me to...');
+        });
+
+        it('Review question should be present', () => {
+            utilities.verifyElementVisibilityState(thinkSpherePage.reviewQuestionWrapper(), 'visible');
+        });
+
+        it('CSS of \'The problem is asking me to\' section', { tags: 'css' }, () => {
+            utilities.verifyCSS(thinkSpherePage.problemAskingToMeTextWrapper(), {
+                'color': css.color.primaryBtnBorder,
+                'font-size': css.fontSize.normal,
+                'font-weight': css.fontWeight.bold,
+            });
+            utilities.verifyCSS(thinkSpherePage.reviewComponentWrapper(), {
+                'border': `1px solid ${css.color.secondaryBtnBorder}`,
+                'border-radius': '12px'
+            });
+        });
+
+        it('When User type in the \'The problem is asking me to\' in the plan tab, then it should render in the \'The problem is asking me to\' in the review tab', () => {
+            thinkSpherePage.steps.clickOnPlanTab();
+            thinkSpherePage.steps.verifyProblemAskingTextAreaFunctionality('This is a test text for the problem.');
+            thinkSpherePage.steps.clickOnReviewTab();
+            utilities.verifyElementVisibilityState(thinkSpherePage.problemStatementWrapper(), 'visible');
+            utilities.verifyInnerText(thinkSpherePage.problemStatementWrapper(), 'This is a test text for the problem.');
+        });
+
+        it('CSS of \'The problem is asking me to\' section statement', { tags: 'css' }, () => {
+            utilities.verifyCSS(thinkSpherePage.problemStatementWrapper(), {
+                'color': css.color.text,
+                'font-size': css.fontSize.default,
+                'font-weight': css.fontWeight.regular,
+            });
+        });
+    });
+});

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

@@ -99,7 +99,7 @@ describe('Create question page - Audio player: Header section and saving resourc
         });
 
         describe('Validation error messages', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please upload a file']);
+            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton();
 
             it('Validation error message(s) should be displayed below required input field(s)', () => {
                 utilities.verifyElementVisibilityState(audioPlayerPage.errorMessage(), 'visible');

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

@@ -2,7 +2,6 @@ import abortEarlySetup from "../../../support/helpers/abortEarly";
 import { uploadResponsePage } from "../../../pages";
 import utilities from "../../../support/helpers/utilities";
 import { supportedFileType } from "../../../fixtures/uploadResponseFileType";
-import { commonComponents } from "../../../pages/components";
 const css = Cypress.env('css');
 
 const fileSizeLimitOptions = ['5', '10', '15', '20', '100'];
@@ -374,37 +373,4 @@ describe('Create question page - Upload Response: Question Instructions, Support
 
         uploadResponsePage.tests.verifyWarningMessageDisappear();
     });
-
-    describe('User should be able to edit incomplete authored question', () => {
-        abortEarlySetup();
-        before(() => {
-            uploadResponsePage.steps.navigateToCreateQuestion('upload response');
-            cy.barsPreLoaderWait();
-            uploadResponsePage.steps.clickOnSupportedFilesTypesAccordion();
-            uploadResponsePage.steps.uncheckDefaultSelectedFileTypes();
-            uploadResponsePage.steps.saveAQuestionWithIncompleteAuthoring();
-            uploadResponsePage.steps.editItem();
-        });
-
-        it('Warning icons should be displayed on the required fields', () => {
-            uploadResponsePage.steps.verifyWarningIconOnRequiredFields(['Please select a file type']);
-        });
-
-        it('When file type is selected then warning icons should disappear', () => {
-            uploadResponsePage.steps.clickOnSupportedFilesTypesAccordion();
-            uploadResponsePage.steps.selectSupportedFileTypeOption(0);
-            uploadResponsePage.supportedFileTypesAccordionWrapper()
-                .within(() => {
-                    utilities.verifyElementVisibilityState(commonComponents.warningIcon(), 'notExist');
-                });
-        });
-
-        it('Clicking on Save Question button the question should get saved and a snackbar with text \'Saved successfully!\' should be displayed', () => {
-            uploadResponsePage.steps.saveAQuestionAndVerifySnackbar();
-        });
-
-        it('Warning icon should not be visible', () => {
-            utilities.verifyElementVisibilityState(uploadResponsePage.warningIcon(), 'notExist');
-        });
-    });
 });

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

@@ -1,9 +1,6 @@
 import abortEarlySetup from "../../../support/helpers/abortEarly";
-import { uploadResponsePage, dialogBoxBase, itemPreviewPage } from "../../../pages";
+import { uploadResponsePage, dialogBoxBase } from "../../../pages";
 import utilities from "../../../support/helpers/utilities";
-import { browseItemsPage } from "../../../pages/components";
-var itemReferenceID = ""
-
 
 describe('Create question page - Upload Response: Header section and Saving question', () => {
     before(() => {
@@ -52,38 +49,4 @@ describe('Create question page - Upload Response: Header section and Saving ques
 
         uploadResponsePage.tests.verifySavedSuccessfullySnackbarCSSAndA11y();
     });
-
-    describe('Saving a question with incomplete authoring', () => {
-        abortEarlySetup();
-        before(() => {
-            uploadResponsePage.steps.navigateToCreateQuestion('upload response');
-            cy.barsPreLoaderWait();
-            uploadResponsePage.steps.clickOnSupportedFilesTypesAccordion();
-            uploadResponsePage.steps.uncheckDefaultSelectedFileTypes();
-        });
-
-        it('User should be able to save the question with incomplete authoring and display a snackbar with the text "Saved successfully!" when the Save Question button is clicked', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please select a file type']);
-            uploadResponsePage.steps.saveAQuestionWithIncompleteAuthoring();
-        });
-        uploadResponsePage.tests.verifySavedSuccessfullySnackbarCSSAndA11y();
-    });
-
-    describe('Save as you go - Browse item page contents', () => {
-        abortEarlySetup();
-        before(() => {
-            uploadResponsePage.steps.navigateToCreateQuestion('upload response');
-            cy.barsPreLoaderWait();
-            uploadResponsePage.steps.clickOnSupportedFilesTypesAccordion();
-            uploadResponsePage.steps.uncheckDefaultSelectedFileTypes();
-            uploadResponsePage.steps.saveAQuestionWithIncompleteAuthoring();
-            utilities.verifyElementVisibilityState(itemPreviewPage.referenceID(), 'visible');
-            itemReferenceID = itemPreviewPage.steps.getItemReferenceID();
-            browseItemsPage.steps.navigateToBrowseItemsPage();
-        });
-
-        it('When user saves an incompletely authored question then a warning icon should be visible in browse items page', () => {
-            browseItemsPage.steps.verifyWarningIconInBrowseItemPage(`${itemReferenceID}`);
-        });
-    });
 });

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

@@ -159,21 +159,31 @@ describe('Create item page - Video response: Question instructions, Maximum reco
             });
         });
 
-        it('When the user focuses in and out of the empty \'Maximum recording duration\' input field, Validation error should not be displayed below the \'Maximum recording duration\' input field and it should take up default value i.e. 300', () => {
+        it('When the user focuses in and out of the empty \'Maximum recording duration\' input field, \'Error: Maximum recording duration is required.\' validation error should be displayed below the \'Maximum recording duration\' input field', () => {
             videoResponsePage.steps.clearMaximumRecordingDurationInputField();
-            videoResponsePage.steps.verifyMaximumRecordingDuration(300);
-            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'notExist');
+            utilities.verifyInnerText(videoResponsePage.errorMessage(), 'Error: Maximum recording duration is required.');
+            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'visible');
         });
 
+        videoResponsePage.tests.verifyErrorMessageCSSAndA11y();
+
         it('When the user updates the \'Maximum recording duration\' value, then the validation message \'Error: Maximum recording duration is required.\' should disappear.', () => {
             videoResponsePage.steps.setMaximumRecordingDuration(1000);
             videoResponsePage.steps.verifyErrorMessageIsNotDisplayed();
         });
 
-        it('When the user has set \'Maximum recording duration\' to \'0\' (zero), error message should not be displayed and it should take default value i.e 300', () => {
+        it('When the user has set \'Maximum recording duration\' to \'0\' (zero), a validation message \'Error: Value must be greater than 0 secs.\' should be displayed', () => {
             videoResponsePage.steps.setMaximumRecordingDuration(0);
-            videoResponsePage.steps.verifyMaximumRecordingDuration(300);
-            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'notExist');
+            videoResponsePage.steps.verifyMaximumRecordingDuration(0);
+            utilities.verifyInnerText(videoResponsePage.errorMessage(), 'Error: Value must be greater than 0 secs.');
+            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'visible');
+        });
+
+        videoResponsePage.tests.verifyErrorMessageCSSAndA11y();
+
+        it('When the user updates the \'Maximum recording duration\' value, then the validation message \'Error: Value must be greater than 0 secs.\' should disappear', () => {
+            videoResponsePage.steps.setMaximumRecordingDuration(1000);
+            videoResponsePage.steps.verifyErrorMessageIsNotDisplayed();
         });
 
         it('When user adds decimal values or alphanumeric values then only numeric values should be displayed in the maximum recording length input field', () => {
@@ -194,27 +204,32 @@ describe('Create item page - Video response: Question instructions, Maximum reco
             videoResponsePage.steps.verifyMaximumRecordingDuration(5);
         });
 
-        it('When the user focuses in and out of the empty \'Maximum recording duration\' input field, validation error should not be displayed below the \'Maximum recording duration\' input field', () => {
+        it('When the user focuses in and out of the empty \'Maximum recording duration\' input field, \'Error: Maximum recording duration is required.\' validation error should be displayed below the \'Maximum recording duration\' input field', () => {
             videoResponsePage.steps.clearMaximumRecordingDurationInputField();
             videoResponsePage.steps.toggleMaximumRecordingDurationInputField('Secs');
             videoResponsePage.steps.clearMaximumRecordingDurationInputField();
-            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'notExist');
+            utilities.verifyInnerText(videoResponsePage.errorMessage(), 'Error: Maximum recording duration is required.');
+            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'visible');
         });
 
-        it('When the user updates the \'Maximum recording duration\' value, then the validation message should not be displayed', () => {
+        videoResponsePage.tests.verifyErrorMessageCSSAndA11y();
+
+        it('When the user updates the \'Maximum recording duration\' value, then the validation message \'Error: Maximum recording duration is required.\' should disappear.', () => {
             videoResponsePage.steps.setMaximumRecordingDuration(5);
             videoResponsePage.steps.verifyErrorMessageIsNotDisplayed();
         });
 
-        it('When the user has set \'Maximum recording duration\' to \'0\' (zero), a validation message should not be displayed and it should take default value i.e. 300', () => {
-            videoResponsePage.steps.setMaximumRecordingDuration(0);
-            videoResponsePage.steps.verifyMaximumRecordingDuration(300);
+        it('When the user has set \'Maximum recording duration\' to \'0\' (zero), a validation message \'Error: Value must be greater than 0 mins.\' should be displayed', () => {
+            videoResponsePage.steps.setMaximumRecordingDurationNew(0);
+            videoResponsePage.steps.verifyMaximumRecordingDuration(0);
             // Uncomment once https://redmine.zeuslearning.com/issues/583618 is resolved
             // utilities.verifyInnerText(videoResponsePage.errorMessage(), 'Error: Value must be greater than 0 mins.');
-            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'notExist');
+            utilities.verifyElementVisibilityState(videoResponsePage.errorMessage(), 'visible');
         });
 
-        it('When the user updates the \'Maximum recording duration\' value, then the validation message should not be displayed', () => {
+        videoResponsePage.tests.verifyErrorMessageCSSAndA11y();
+
+        it('When the user updates the \'Maximum recording duration\' value, then the validation message \'Error: Value must be greater than 0 mins.\' should disappear', () => {
             videoResponsePage.steps.setMaximumRecordingDuration(5);
             videoResponsePage.steps.verifyErrorMessageIsNotDisplayed();
             videoResponsePage.steps.toggleMaximumRecordingDurationInputField('Mins');

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

@@ -98,22 +98,7 @@ describe('Create item page - Charts - Dot plot: Header section and saving questi
             chartsDotPlotPage.steps.selectDotPlot();
         });
 
-        describe('Validation error messages', () => {
-            dialogBoxBase.tests.verifyRequiredFieldsWarningPopupOnClickingSaveButton(['Please set points']);
-
-            it('Validation error messages should be displayed below required input fields', () => {
-                chartsDotPlotPage.steps.verifyQuestionInstructionsErrorMessageIsNotDisplayed();
-                chartsDotPlotPage.steps.verifyWarningIconOnRequiredFields(['Please set points']);
-                chartsDotPlotPage.steps.verifySpecifyCorrectAnswerErrorIconNotExists();
-            });
-
-            it('Validation error messages should disappear when required input fields are filled', () => {
-                chartsDotPlotPage.steps.allotPoints(10);
-                chartsDotPlotPage.steps.verifyErrorMessageIsNotDisplayed();
-            });
-
-            chartsDotPlotPage.tests.verifyCreateItemWrapperContentsA11y();
-        });
+        chartsDotPlotPage.tests.verifyCreateItemWrapperContentsA11y();
 
         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', () => {

package/cypress/pages/brainingCampManipulativePage.js

@@ -20,7 +20,7 @@ const selectors = {
     selectAManipulativeLabel: () => cy.get('[class*="SelectManipulativeWrapper"] [class*="BrainingcampManipulativestyle__WrapperSubHeader"]'),
     enterAShareCodeLabel: () => cy.get('[class*="EnterShareCodeWrapper"] [class*="BrainingcampManipulativestyle__WrapperSubHeader"]'),
     enterAShareCodeInputField: () => cy.get('[class*="EnterShareCodeWrapper"] input'),
-    previewTabCanvas: () => cy.get('.canvas'),
+    previewTabCanvas: () => cy.get('.bcm-inner'),
 }
 
 const steps = {

package/cypress/pages/chartsBarPage.js

@@ -1306,26 +1306,6 @@ const steps = {
     verifyPenaltyPointsForEachIncorrectBar: (penaltyPoints) => {
         utilities.verifyInnerText(autoScoredScoringSectionMultiResponseType.penaltyPointsDetailsSectionAllottedPointsLabel(), `Penalty points for each incorrect bar: ${penaltyPoints}`);
     },
-
-    verifyAnswerStatusBannerNotExist: () => {
-        chartsBarPage.correctIncorrectAnswerTextWrapper()
-            .should('not.exist');
-    },
-
-    verifyAnswerStatusBannerExist: () => {
-        chartsBarPage.correctIncorrectAnswerTextWrapper()
-            .should('be.visible');
-    },
-
-    verifyCorrectAnswerSectionExist: () => {
-        chartsBarPage.correctAnswersLabel()
-            .should('be.visible');
-    },
-
-    verifyCorrectAnswerSectionNotExist: () => {
-        chartsBarPage.correctAnswersLabel()
-            .should('not.exist');
-    },
 }
 
 const tests = {

package/cypress/pages/components/createQuestionBasePage.js

@@ -146,13 +146,6 @@ const steps = {
                     .within(() => {
                         utilities.verifyElementVisibilityState(commonComponents.warningIcon(), 'exist');
                     });
-            } 
-            else if (field === 'Please select a file type') {
-                // Upload Response Select File Type Accordion
-                cy.get('.edit-question-edit-tab-wrapper .ngie-accordion-summary')
-                    .within(() => {
-                        utilities.verifyElementVisibilityState(commonComponents.warningIcon(), 'exist');
-                    });
             }
         })
     },

package/cypress/pages/components/defaultToolDropdown.js

@@ -32,7 +32,7 @@ const steps = {
 
 const tests = {
     verifyDefaultToolDropdown:(toolOptionsArray, defaultTool)=>{
-        const defaultSelectedTool = defaultTool || toolOptionsArray[0];
+        const defaultSelectedTool = defaultTool || toolOptionsArray[1];
         it(`\'Default tool\' label and dropdown should be displayed with \'${defaultSelectedTool}\' option selected by default`, () => {
             utilities.verifyInnerText(defaultToolDropdown.defaultToolDropdownLabel(), 'Default tool');
             utilities.verifyInnerText(defaultToolDropdown.defaultToolDropdown(), defaultSelectedTool);

package/cypress/pages/components/desmosToolComponent.js

@@ -21,7 +21,7 @@ const selectors = {
     previewTabDesmosToolKeypad: () => cy.get('[class*="DesmosToolstyles__DesmosToolViewWrapper"] .dcg-basic-keypad-container'),
     previewTabDesmosToolKeypadKeys: (ariaLabel = null) => {
         if (ariaLabel) {
-            return cy.get(`.dcg-basic-keypad  .dcg-keypad-btn[aria-label*="${ariaLabel}"]`)
+            return cy.get(`.dcg-basic-keypad  .dcg-keypad-btn[aria-label*="${ariaLabel}"]:visible`)
         } else {
             return cy.get('.dcg-basic-keypad  .dcg-keypad-btn')
         }

package/cypress/pages/components/scoringSectionBaseEditTab.js

@@ -29,8 +29,6 @@ const selectors = {
         }
     },
     minimumPointsLabel: () => cy.get('[class*="min-score-points-label"]'),
-    questionLabel: () => cy.get('[class*="addResponseCKEditorstyles__TitleWrapper"]'),
-    questionWarningIcon: () => cy.get('[class*="addResponseCKEditorstyles__IconWrapper"]'),
     minimumPointsInputField: () => cy.get('.min-score-points-input-field input'),
 }
 
@@ -83,7 +81,6 @@ const steps = {
         scoringSectionBaseEditTab.scoringTypeDropdownListOptions(convertedString)
             .should('be.visible') // Ensure the dropdown option is visible
             .click();
-        cy.wait(2000); // Wait for the dropdown to close
         utilities.verifyElementVisibilityState(commonComponents.dropdownList(), 'notExist');
     },
 

package/cypress/pages/desmos3DGraphingPage.js

@@ -1,5 +1,5 @@
 import utilities from "../support/helpers/utilities";
-import { commonComponents, createQuestionBasePage, questionInstructionsComponent, additionalSettingsPanel, scoringSectionBaseEditTab, additionalSettingsAccessibilitySectionComponent, studentViewSettingsLabelComponent, hideExpressionListComponent, toolSettingsComponent } from "./components";
+import { commonComponents, createQuestionBasePage, questionInstructionsComponent, additionalSettingsPanel, scoringSectionBaseEditTab, additionalSettingsAccessibilitySectionComponent, studentViewSettingsLabelComponent, hideExpressionListComponent } from "./components";
 import { desmosToolComponent } from "./components/desmosToolComponent";
 const css = Cypress.env('css');
 
@@ -10,13 +10,12 @@ const selectors = {
     ...additionalSettingsPanel,
     ...questionInstructionsComponent,
     desmosGraphingTool: () => cy.get('[id*="desmos-graph-tool"]'),
-    desmosGraphingToolExpressionPanel: () => cy.get('.dcg-exppanel-container'),
+    desmosGraphingToolExpressionPanel: () => cy.get('[id*="desmos-graph-tool"] .dcg-exppanel-container.dcg-add-shadow'),
     studentViewSettingsLabel: () => cy.get('[class*="StudentViewWrapper"]'),
     hideExpressionListLabel: () => cy.get('[data-ngie-testid="hide-expression-list-checkbox"] .MuiFormControlLabel-label'),
     hideExpressionListCheckbox: () => cy.get('[data-ngie-testid="hide-expression-list-checkbox"] input'),
     showHideListButton: () => cy.get('.dcg-show-expressions-tab[role="button"]'),
     desmosGraphingWidthLabel: () => cy.get('[class*="LabelInputWrapper"]').eq(0),
-    desmosComponentGradingView: () => cy.get('[class*="DesmosGraphingPreviewstyles__DesmosWrapper"]'),
     desmosGraphingWidthInputField: () => cy.get('[class*="DimensionInputWrapper"] input').eq(0),
     desmosGraphingHeightLabel: () => cy.get('[class*="LabelInputWrapper"]').eq(1),
     desmosGraphingHeightInputField: () => cy.get('[class*="DimensionInputWrapper"] input').eq(1),
@@ -39,16 +38,6 @@ const selectors = {
     errorMessage: () => cy.get('.error-text-message'),
     resourceLinkPreviewTitle: () => cy.get('[class*="DesmosGraphingstyles__ResourceLinkPreviewLabel"]'),
     desmosComponent: () => cy.get('[class*="DesmosGraphingstyles__DesmosComponentWrapper"]'),
-    widthLabel: () => cy.get('[class*="StudentViewSettingsstyles__LabelInputWrapper"]').eq(0),
-    heightLabel: () => cy.get('[class*="StudentViewSettingsstyles__LabelInputWrapper"]').eq(1),
-    lockUnlockAspectRatioButton: () => cy.get('[class*="StudentViewSettingsstyles__LockIconWrapper"] button'),
-    resetButton: () => cy.get('[class*="StudentViewSettingsstyles__ResetIconWrapper"] button'),
-    desmosResourceCanvasEditTab: () => cy.get('[id*="desmos-3d-graph-tool"]'),
-    desmosResourceCanvasPreviewTab: () => cy.get('[class*="DesmosGraphingPreviewstyles__DesmosPreview"]'),
-    addIconDesmos: () => cy.get('.dcg-add-expression-container .dcg-icon-plus'),
-    expressionInputField: () => cy.get('.dcg-action-newmath'),
-    editIconPencil: () => cy.get('.icon-pencil'),
-    teacherGuidelinesInputField: () => cy.get('[class*="TeacherGuidelinesstyles__TextField"] input'),
 }
 
 const steps = {
@@ -58,7 +47,6 @@ const steps = {
     ...additionalSettingsPanel.steps,
     ...questionInstructionsComponent.steps,
     ...commonComponents.steps,
-    ...toolSettingsComponent.steps,
     verifyHideExpressionListCheckboxUnchecked: () => {
         desmos3DGraphingPage.hideExpressionListCheckbox()
             .should('not.be.checked');
@@ -334,128 +322,10 @@ const steps = {
     },
     clearInputToInsertResourceLinkInputField: () => {
         desmos3DGraphingPage.insertResourceLinkInputField()
-            .click()
-        desmos3DGraphingPage.insertResourceLinkInputField()
-            .type('{selectall}{backspace}')
+            .clear();
         cy.get('body')
             .click();
     },
-    verifyLockedStateOfLockUnlockAspectRatioButton: () => {
-        desmos3DGraphingPage.lockUnlockAspectRatioButton()
-            .should('have.attr', 'aria-label', 'Locked aspect ratio');
-    },
-    verifyUnlockedStateOfLockUnlockAspectRatioButton: () => {
-        desmos3DGraphingPage.lockUnlockAspectRatioButton()
-            .should('have.attr', 'aria-label', 'Unlocked aspect ratio');
-    },
-    /**
-     * @description add input to width input field
-     * @param {number} width Width to be set for geoGebra resource
-     */
-    addInputToWidthInputField: (width) => {
-        desmos3DGraphingPage.widthInputField()
-            .clear()
-            .type(width)
-            .blur();
-        utilities.verifyInputFieldValue(desmos3DGraphingPage.widthInputField(), width);
-    },
-    /**
-     * @description add input to height input field
-     * @param {number} height Height to be set for geoGebra resource
-     */
-    addInputToHeightInputField: (height) => {
-        desmos3DGraphingPage.heightInputField()
-            .clear()
-            .type(height)
-            .blur();
-        utilities.verifyInputFieldValue(desmos3DGraphingPage.heightInputField(), height);
-    },
-    /**
-     * Verify width of geoGebra resource canvas in edit tab
-     * @param {number} width Width of geoGebra resource canvas in edit tab
-     */
-    verifyCanvasWidthEditTab: (width) => {
-        utilities.verifyCSS(desmos3DGraphingPage.desmosResourceCanvasEditTab(), {
-            'width': `${width}px`
-        });
-    },
-    /**
-     * Verify height of geoGebra resource canvas in edit tab
-     * @param {number} height Height of geoGebra resource canvas in edit tab
-     */
-    verifyCanvasHeightEditTab: (height) => {
-        utilities.verifyCSS(desmos3DGraphingPage.desmosResourceCanvasEditTab(), {
-            'height': `${height}px`
-        });
-    },
-    clickOnResetButton: () => {
-        desmos3DGraphingPage.resetButton()
-            .click();
-    },
-    clickOnLockUnlockAspectRatioButton: () => {
-        desmos3DGraphingPage.lockUnlockAspectRatioButton()
-            .click();
-    },
-    /**
- * Verify width of geoGebra resource canvas in preview tab
- * @param {number} width Width of geoGebra resource canvas in preview tab
- */
-    verifyCanvasWidthPreviewTab: (width) => {
-        utilities.verifyCSS(desmos3DGraphingPage.desmosResourceCanvasPreviewTab(), {
-            'width': `${width}px`
-        });
-    },
-    /**
- * Verify height of geoGebra resource canvas in preview tab
- * @param {number} height Height of geoGebra resource canvas in preview tab
- */
-    verifyCanvasHeightPreviewTab: (height) => {
-        utilities.verifyCSS(desmos3DGraphingPage.desmosResourceCanvasPreviewTab(), {
-            'height': `${height}px`
-        });
-    },
-    /**
- * @description Types a mathematical expression in the Desmos expression input field
- * @param {string} expression The mathematical expression to type
- */
-    typeExpression: (expression) => {
-        desmos3DGraphingPage.expressionInputField()
-            .click();
-        desmos3DGraphingPage.expressionInputField()
-            .type(expression);
-    },
-    /**
-    * @description Verifies that the specified expression is not present in the Desmos expression field
-    * @param {string} expression The expression that should not be present
-    */
-    verifyExpressionNotPresent: (expression) => {
-        desmos3DGraphingPage.expressionInputField()
-            .should('not.contain', expression);
-    },
-    editQuestionItemView: () => {
-        desmos3DGraphingPage.editIconPencil()
-        .click();
-    },
-    verifyFontSizeDropdown: (fontSize) => {
-        desmos3DGraphingPage.fontSizeDropdown()
-            .should('have.text', fontSize);
-    },
-    verifyTeacherGuidelinesInputField: (text) => {
-        desmos3DGraphingPage.additionalSettingsTeacherGuidelinesInputField()
-            .should('have.text', text);
-    },
-    verifySampleAnswerInputField: (text) => {
-        desmos3DGraphingPage.additionalSettingsSampleAnswerInputField()
-            .should('have.text', text);
-    },
-    verifyAcknowledgementsInputField: (text) => {
-        desmos3DGraphingPage.additionalSettingsAcknowledgementsInputField()
-            .should('have.text', text);
-    },
-    verifyFlagThisItemNonAccessibleCheckboxIsChecked: () => {
-        desmos3DGraphingPage.flagNonAccessibleCheckbox()
-            .should('be.checked');
-    },
 }
 
 const tests = {
@@ -467,7 +337,7 @@ const tests = {
     ...additionalSettingsAccessibilitySectionComponent.tests,
     ...studentViewSettingsLabelComponent.tests,
     ...hideExpressionListComponent.tests,
-
+    
     verifyGraphingQuestionSpecifyPredefinedExpressionContent: () => {
         it('When user selects a scoring type the contents of the Specify predefined expression should be displayed', () => {
             utilities.verifyElementVisibilityState(desmos3DGraphingPage.desmosGraphingTool(), 'exist');
@@ -488,21 +358,6 @@ const tests = {
         it('Accessibility of error message', { tags: 'a11y' }, () => {
             cy.checkAccessibility(commonComponents.nextGenCreateItemWrapper());
         });
-    },
-
-    verifyQuestionInstructionsInputFieldPreviewTab: () => {
-        it('When user has not entered any text in the Question instructions input field in the \'Edit\' tab then nothing should be displayed in the \'Preview\' tab', () => {
-            createQuestionBasePage.steps.switchToPreviewTab();
-            //Failing due to https://redmine.zeuslearning.com/issues/553382
-            utilities.verifyTextContent(questionInstructionsComponent.questionInstructionsText(), '')
-        });
-
-        it('When the user specifies question instructions, then the added question instructions should be displayed in the \'Preview\' tab', () => {
-            createQuestionBasePage.steps.switchToEditTab();
-            questionInstructionsComponent.steps.addTextInQuestionInstructionsInputField('Which of the following is the major contributor to increased carbon dioxide levels because of urbanization? Select your answer from the options below.');
-            createQuestionBasePage.steps.switchToPreviewTab();
-            utilities.verifyTextContent(questionInstructionsComponent.questionInstructionsTextPreviewTab(), 'Which of the following is the major contributor to increased carbon dioxide levels because of urbanization? Select your answer from the options below.');
-        });
     }
 }