itemengine-cypress-automation 1.0.178-figDndMigration-78c8415.0 → 1.0.179-figDndMigration-118c15c.0

package/cypress/support/commands.js

@@ -155,13 +155,13 @@ Cypress.Commands.add('learnosityLoaderWait', () => {
 });
 
 Cypress.Commands.add('lazyLoadPreviewQuestions', (count, retries = 5) => {
-    iePage.questionWrapper()
+    iePage.questionAndResourceWrapper()
         .then((elements) => {
             if (retries <= 0) {
                 throw new Error('Itemengine questions did not lazy load in time');
             };
             if (elements.length < count) {
-                iePage.questionWrapper()
+                iePage.questionAndResourceWrapper()
                     .last()
                     .scrollIntoView()
                     .wait(1000);

package/cypress/support/migrationHelpers/extractLrnQuestionData.js

@@ -32,6 +32,7 @@ export const lrnPage = {
     uploadResponseSupportedFileTypes: () => cy.get('.lrn-fileupload-support-copy'),
     uploadResponseFileLimit: () => cy.get('.lrn-limit-status'),
     uploadResponseToolbar: () => cy.get('[data-lrn-component="toolbar"]'),
+    contentBlocksQuestion: () => cy.get('.lrn_sharedpassage'),
     steps: {
         checkShowAnswersToggle: () => {
             lrnPage.showAnswersToggle()
@@ -630,6 +631,20 @@ export const extractLrnQuestionData = {
         lrnQuestionDataArr.push(obj);
     },
 
+    contentBlocks: (lrnQuestionDataArr, index) => {
+        let obj = {};
+        cy.log(`Extracting the passage from question ${index}`);
+        obj.questionIndex = index;
+        obj.questionType = 'contentBlocks';
+        lrnPage.contentBlocksQuestion()
+            .eq(index)
+            .then(($question) => {
+                let text = $question[0].innerText;
+                obj.passageText = text;
+            });
+        lrnQuestionDataArr.push(obj);
+    },
+
     figDragAndDrop: (lrnQuestionDataArr, index) => {
         let obj = {};
         cy.log(`Extracting the question instructions, question, response areas count, draggable option container position, drag handle visibility, draggable options from question ${index}`);

package/cypress/support/migrationHelpers/lrnQestionTypesENUM.js

@@ -13,6 +13,7 @@ const lrnQuestionTypesENUM = {
     shortTextResponse: 'Short text',
     uploadResponse: 'File upload',
     figDragAndDrop: 'Cloze with drag & drop',
+    contentBlocks: 'Passage'
 }
 
 export default lrnQuestionTypesENUM;

package/cypress/support/migrationHelpers/migrationScript.js

@@ -27,6 +27,7 @@ const extractLrnPreviewData = (currQuestionType, lrnQuestionDataArr, index) => {
         case lrnQuestionTypesENUM.shortTextResponse: return extractLrnQuestionData.shortTextResponse(lrnQuestionDataArr, index);
         case lrnQuestionTypesENUM.uploadResponse: return extractLrnQuestionData.uploadResponse(lrnQuestionDataArr, index);
         case lrnQuestionTypesENUM.figDragAndDrop: return extractLrnQuestionData.figDragAndDrop(lrnQuestionDataArr, index);
+        case lrnQuestionTypesENUM.contentBlocks: return extractLrnQuestionData.contentBlocks(lrnQuestionDataArr, index);
         default: throw new Error('Invalid lrn question type');
     }
 }
@@ -44,6 +45,7 @@ const verifyIePreviewData = (questionType, questionData, index) => {
         case 'shortTextResponse': return verifyIeQuestionData.shortTextResponse(questionData, index);
         case 'uploadResponse': return verifyIeQuestionData.uploadResponse(questionData, index);
         case 'figDragAndDrop': return verifyIeQuestionData.figDragAndDrop(questionData, index);
+        case 'contentBlocks': return verifyIeQuestionData.contentBlocks(questionData, index);
         default: throw new Error('Invalid ngie question type');
     }
 }
@@ -58,6 +60,7 @@ const extractLrnGradingData = (currQuestionType, lrnGradingDataArr, index) => {
         case lrnQuestionTypesENUM.shortTextResponse: return extractLrnQuestionData.shortTextResponseGrading(lrnGradingDataArr, index);
         case lrnQuestionTypesENUM.uploadResponse: return cy.log('Manually Graded Question Type');
         case lrnQuestionTypesENUM.figDragAndDrop: return extractLrnQuestionData.figDragAndDropGrading(lrnGradingDataArr, index);
+        case lrnQuestionTypesENUM.contentBlocks: return cy.log('Resource and tool');
         default: throw new Error('Invalid lrn question type');
     }
 }
@@ -72,6 +75,7 @@ const verifyIeGradingData = (questionType, questionData, index) => {
         case 'shortTextResponse': return verifyIeQuestionData.shortTextResponseGrading(questionData, index);
         case 'uploadResponse': return cy.log('Manually Graded Question Type');
         case 'figDragAndDrop': return verifyIeQuestionData.figDragAndDropGrading(questionData, index);
+        case 'contentBlocks': return cy.log('Resource and tool');
         default: throw new Error('Invalid ngie question type');
     }
 }
@@ -92,7 +96,7 @@ export const migrationScript = (referenceIds) => {
                         cy.visit(`/items-list/item/${utilities.base64Encoding(referenceId)}`);
                         cy.pageLoadWait('getItemPreview');
                         cy.get('@getItemPreview').then((req) => {
-                            let questionCount = req.response.body.data.getItemPreview.item.questionParts.length;
+                            let questionCount = req.response.body.data.getItemPreview.item.questionParts.length + req.response.body.data.getItemPreview.item.resources.length;
                             cy.lazyLoadPreviewQuestions(questionCount);
                         });
                     });

package/cypress/support/migrationHelpers/verifyIeQuestionData.js

@@ -1,4 +1,4 @@
-import { essayResponsePage, fillInTheGapsDragAndDropPage, fillInTheGapsTextPage, multipleSelectionPage, textEntryMathPage, uploadResponsePage } from "../../pages";
+import { essayResponsePage, fillInTheGapsDragAndDropPage, contentBlocksPage, fillInTheGapsTextPage, multipleSelectionPage, textEntryMathPage, uploadResponsePage } from "../../pages";
 import { draggableOptionContainer, fillInTheGapsDragAndDropCommonComponents } from "../../pages/components";
 import { singleSelectionPage } from "../../pages/singleSelectionPage"
 import utilities from "../helpers/utilities";
@@ -9,6 +9,7 @@ export const iePage = {
     mcqOption: () => cy.get('.mcq_Label'),
     mcqOptionWrapper: () => cy.get('div[class*="option-wrapper"]'),
     questionWrapper: () => cy.get('.ngie-question-wrapper'),
+    questionAndResourceWrapper: () => cy.get('.item_Widget'),
     barsPreloader: () => cy.get('[id="question-item-instruction-loader"]'),
     previewQuestionTextWrapper: () => cy.get('.preview-question-text-wrapper'),
     //textEntryMathResponseWrapper: () => cy.get('.cloze-math-preview-wrapper .cloze-math-response-input-field'),
@@ -19,6 +20,7 @@ export const iePage = {
     essayResponseWordLimit: () => cy.get('.input-limit-label'),
     essayResponseWordCount: () => cy.get('[class*="indexstyle__WordCharCountWrapper"]'),
     essayResponseFooter: () => cy.get('.essay-character-view-wrapper'),
+    essayResponseLoader: () => cy.get('[class*="InlineLoaderstyles__LoaderDiv"] img'),
     drawingResponseToolbarButton: () => cy.get('[class*="DrawingToolButtonstyled__Container"] svg'),
     drawingResponseLowerCanvas: () => cy.get('.lower-canvas'),
     figCorrectAnswerBlock: () => cy.get('[class*="AnswerCell"]'),
@@ -244,6 +246,9 @@ export const verifyIeQuestionData = {
         cy.get('[class*="ngie-essay-response"]')
             .eq(index)
             .within(() => {
+                iePage.essayResponseLoader()
+                    .scrollIntoView()
+                    .should('not.be.visible');
                 iePage.steps.verifyQuestionInstructions(expectedQuestionData);
                 essayResponsePage.responseField()
                     .then(($element) => {
@@ -289,6 +294,9 @@ export const verifyIeQuestionData = {
         cy.get('[class*="ngie-essay-response"]')
             .eq(index)
             .within(() => {
+                iePage.essayResponseLoader()
+                    .scrollIntoView()
+                    .should('not.be.visible');
                 iePage.steps.verifyQuestionInstructions(expectedQuestionData);
                 essayResponsePage.responseField()
                     .then(($element) => {
@@ -595,6 +603,15 @@ export const verifyIeQuestionData = {
             });
     },
 
+    contentBlocks: (expectedQuestionData, index) => {
+        cy.get('[class*="ContentBlocksPreviewstyles__ContentBlocksPreviewWrapper"]')
+            .eq(index)
+            .then(($element) => {
+                let passageText = $element[0].innerText
+                expect(passageText).to.be.eq(expectedQuestionData.passageText)
+            });
+    },
+
     figDragAndDrop: (expectedQuestionData, index) => {
         cy.get('.ngie-cloze-with-drag-and-drop')
             .eq(index)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.178-figDndMigration-78c8415.0",
+  "version": "1.0.179-figDndMigration-118c15c.0",
   "description": "",
   "main": "index.js",
   "scripts": {