itemengine-cypress-automation 1.0.176-figDndMigration-409c782.0 → 1.0.177-contentBlocksScript-b1350d4.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()
@@ -560,6 +561,7 @@ export const extractLrnQuestionData = {
         cy.log(`Extracting the question instructions and answer input field attributes from question ${index}`);
         obj.questionIndex = index;
         obj.questionType = 'shortTextResponse'
+        lrnPage.steps.extractQuestionInstructions(obj, index);
         lrnPage.questionWrapper()
             .eq(index)
             .within(() => {
@@ -576,11 +578,11 @@ export const extractLrnQuestionData = {
                             obj.specialCharactersEnabled = true;
                         }
                     });
-            });
+            })
         lrnQuestionDataArr.push(obj);
     },
 
-    shortTextResponseGrading: (lrnGradingDataArr, index) => {
+    shortTextResponseGrading: (lrnQuestionDataArr, index) => {
         let obj = {};
         cy.log(`Extracting the question instructions and correct answers from question ${index}`);
         obj.questionIndex = index;
@@ -596,7 +598,7 @@ export const extractLrnQuestionData = {
                     });
                 };
             });
-        lrnGradingDataArr.push(obj);
+        lrnQuestionDataArr.push(obj);
     },
 
     uploadResponse: (lrnQuestionDataArr, index) => {
@@ -629,148 +631,34 @@ export const extractLrnQuestionData = {
         lrnQuestionDataArr.push(obj);
     },
 
-    figDragAndDrop: (lrnQuestionDataArr, index) => {
+    contentBlocks: (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}`);
+        cy.log(`Extracting the passage from question ${index}`);
         obj.questionIndex = index;
-        obj.questionType = 'figDragAndDrop';
-        lrnPage.steps.extractQuestionInstructions(obj, index);
-        lrnPage.questionWrapper()
-            .eq(index)
-            .within(() => {
-                lrnPage.questionContainerPreviewTab()
-                    .then(($question) => {
-                        let innerText = $question[0].innerText;
-                        obj.previewQuestion = innerText;
-                    });
-                lrnPage.clozeResponse()
-                    .then(($responseFields) => {
-                        obj.previewResponseCount = $responseFields.length;
-                    });
-                let options = [];
-                let optionImages = [];
-                let optionEquations = [];
-                lrnPage.draggableResponse()
-                    .each(($option, index) => {
-                        let innerText = $option[0].innerText;
-                        options.push(innerText);
-                        let innerHTML = $option[0].innerHTML;
-                        if (innerHTML.includes('<img')) {
-                            lrnPage.draggableResponse()
-                                .eq(index)
-                                .find('img')
-                                .then(($img) => {
-                                    let altText = $img[0].alt;
-                                    optionImages.push(altText);
-                                });
-                        }
-                        if (innerHTML.includes('<math')) {
-                            lrnPage.draggableResponse()
-                                .eq(index)
-                                .find('math')
-                                .then(($element) => {
-                                    let outerHtml = $element[0].outerHTML;
-                                    optionEquations.push(outerHtml);
-                                });
-                        }
-                    });
-                let position;
-                cy.get('.lrn_possibilityList').invoke('attr', 'class').then(classAttribute => {
-                    const classList = classAttribute.split(' ');
-                    if (classList.includes('lrn_list_bottom')) {
-                        position = 'bottom';
-                    } else if (classList.includes('lrn_list_top')) {
-                        position = 'top';
-                    } else if (classList.includes('lrn_list_left')) {
-                        position = 'left'
-                    } else if (classList.includes('lrn_list_right')) {
-                        position = 'right'
-                    } else {
-                        position = null;
-                    }
-                    obj.position = position;
-                });
-                let dragHandleVisibility;
-                lrnPage.draggableResponse().eq(0).invoke('attr', 'class').then(classAttribute => {
-                    const classList = classAttribute.split(' ');
-                    if (classList.includes('lrn_btn_no_handle')) {
-                        dragHandleVisibility = false;
-                    } else {
-                        dragHandleVisibility = true;
-                    }
-                    obj.dragHandleVisibility = dragHandleVisibility;
-                });
-                obj.options = options;
-                obj.optionImages = optionImages;
-                obj.optionEquations = optionEquations;
+        obj.questionType = 'contentBlocks';
+        const passageArray = [];
+        lrnPage.contentBlocksQuestion()
+            .find('p')
+            .each(($element) => {
+                let innerText = $element[0].innerText;
+                passageArray.push(innerText);
             });
-        lrnQuestionDataArr.push(obj);
-    },
-
-    figDragAndDropGrading: (lrnGradingDataArr, index) => {
-        let obj = {};
-        cy.log(`Extracting the question instructions, response area count and correct answers from question ${index}`);
-        obj.questionIndex = index;
-        obj.questionType = 'figDragAndDrop';
-        lrnPage.steps.extractQuestionInstructions(obj, index);
-        lrnPage.questionWrapper()
-            .eq(index)
-            .within(() => {
-                lrnPage.questionContainerPreviewTab()
-                    .then(($question) => {
-                        let innerText = $question[0].innerText;
-                        obj.previewQuestion = innerText;
-                    });
-                lrnPage.clozeResponse()
-                    .then(($responseFields) => {
-                        obj.previewResponseCount = $responseFields.length;
-                    });
-                let correctAnswers = [];
-                //correctAnswer
-                cy.get('.lrn_correctAnswerList li')
-                    .each(($answers) => {
-                        let answerData = {}
-                        cy.wrap($answers)
-                            .within(() => {
-                                cy.get('.lrn_responseIndex')
-                                    .then(($element) => {
-                                        let answerNumeration = $element[0].innerText;
-                                        answerData.answerNumeration = answerNumeration;
-                                    });
-                                let options = []
-                                cy.get('.lrn_responseText')
-                                    .each(($option, index) => {
-                                        let optionData = {}
-                                        let innerText = $option[0].innerText;
-                                        optionData.innerText = innerText;
-                                        let innerHTML = $option[0].innerHTML;
-                                        if (innerHTML.includes('<img')) {
-                                            cy.get('.lrn_responseText')
-                                                .eq(index)
-                                                .find('img')
-                                                .then(($img) => {
-                                                    let altText = $img[0].alt;
-                                                    optionData.altText = altText;
-                                                });
-                                        }
-                                        if (innerHTML.includes('<math')) {
-                                            cy.get('.lrn_responseText')
-                                                .eq(index)
-                                                .find('math')
-                                                .then(($element) => {
-                                                    let outerHtml = $element[0].outerHTML;
-                                                    optionData.equation = outerHtml;
-                                                });
-                                        }
-                                        options.push(optionData);
-                                    });
-                                answerData.options = options
-                            });
-                        correctAnswers.push(answerData);
-                    });
-                obj.correctAnswers = correctAnswers;
+        obj.passageArray = passageArray;
+        lrnPage.contentBlocksQuestion()
+            .then(($element) => {
+                if ($element[0].innerHTML.includes('passage-next-btn')) {
+                    obj.pagination = true;
+                    cy.get('.lrn-sharedpassage-index')
+                        .then(($element) => {
+                            let innerText = $element[0].innerText;
+                            let pageCount = innerText.trim().replace(/\s+/g, '');
+                            obj.pageCount = pageCount;
+                        });
+                } else {
+                    obj.pagination = false;
+                }
             });
-        lrnGradingDataArr.push(obj);
+        lrnQuestionDataArr.push(obj);
     }
 
     /*     singleSelection: (lrnQuestionDataArr, index) => {

package/cypress/support/migrationHelpers/lrnQestionTypesENUM.js

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

package/cypress/support/migrationHelpers/migrationScript.js

@@ -26,7 +26,7 @@ const extractLrnPreviewData = (currQuestionType, lrnQuestionDataArr, index) => {
         case lrnQuestionTypesENUM.figText: return extractLrnQuestionData.figText(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');
     }
 }
@@ -43,7 +43,7 @@ const verifyIePreviewData = (questionType, questionData, index) => {
         case 'figText': return verifyIeQuestionData.figText(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');
     }
 }
@@ -57,7 +57,7 @@ const extractLrnGradingData = (currQuestionType, lrnGradingDataArr, index) => {
         case lrnQuestionTypesENUM.figText: return extractLrnQuestionData.figTextGrading(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');
     }
 }
@@ -71,7 +71,7 @@ const verifyIeGradingData = (questionType, questionData, index) => {
         case 'figText': return verifyIeQuestionData.figTextGrading(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 +92,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,5 +1,5 @@
-import { essayResponsePage, fillInTheGapsDragAndDropPage, fillInTheGapsTextPage, multipleSelectionPage, textEntryMathPage, uploadResponsePage } from "../../pages";
-import { draggableOptionContainer, fillInTheGapsDragAndDropCommonComponents } from "../../pages/components";
+import { contentBlocksPage, essayResponsePage, fillInTheGapsTextPage, multipleSelectionPage, textEntryMathPage, uploadResponsePage } from "../../pages";
+import { draggableOptionContainer } from "../../pages/components";
 import { singleSelectionPage } from "../../pages/singleSelectionPage"
 import utilities from "../helpers/utilities";
 import drawingToolbarOptionsENUM from "./drawingToolbarOptionsENUM";
@@ -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) => {
@@ -556,7 +564,7 @@ export const verifyIeQuestionData = {
                     });
                 } else {
                     utilities.verifyElementVisibilityState(iePage.shortTextResponseCorrectAnswerText(), 'notExist');
-                };
+                }
             });
     },
 
@@ -595,123 +603,28 @@ export const verifyIeQuestionData = {
             });
     },
 
-    figDragAndDrop: (expectedQuestionData, index) => {
-        cy.get('.ngie-cloze-with-drag-and-drop')
+    contentBlocks: (expectedQuestionData, index) => {
+        cy.get('[class*="ContentBlocksPreviewstyles__ContentBlocksPreviewWrapper"]')
             .eq(index)
             .within(() => {
-                iePage.steps.verifyQuestionInstructions(expectedQuestionData);
-                /* fillInTheGapsDragAndDropPage.questionContainerPreviewTab()
-                    .then(($question) => {
-                        let innerText = $question[0].innerText;
-                        expect(expectedQuestionData.previewQuestion).to.be.eq(innerText);
-                    });
-                fillInTheGapsDragAndDropPage.dropzonePreviewTab()
-                    .then(($resposneWrapper) => {
-                        expect($resposneWrapper.length).to.be.eq(expectedQuestionData.previewResponseCount);
-                    }); */
-                let position;
-                cy.get('.preview-container-split-view').invoke('attr', 'class').then(classAttribute => {
-                    const classList = classAttribute.split(' ');
-                    if (classList.includes('placement-bottom')) {
-                        position = 'bottom';
-                    } else if (classList.includes('placement-top')) {
-                        position = 'top';
-                    } else if (classList.includes('placement-left')) {
-                        position = 'left'
-                    } else if (classList.includes('placement-right')) {
-                        position = 'right'
-                    } else {
-                        position = null;
-                    }
-                }).then(() => {
-                    expect(position).to.be.eq(expectedQuestionData.position);
-                });
-                if (expectedQuestionData.dragHandleVisibility) {
-                    draggableOptionContainer.draggableOption()
-                        .eq(0)
-                        .within(() => {
-                            utilities.verifyElementVisibilityState(draggableOptionContainer.draggableOptionDragIcon(), 'exist');
-                        });
-                }
-                let options = [];
-                draggableOptionContainer.draggableOption()
-                    .each(($option) => {
-                        let innerText = $option[0].innerText;
-                        options.push(innerText);
-                    }).then(() => {
-                        expect(options).to.have.deep.members(expectedQuestionData.options);
-                    });
-                if (expectedQuestionData.optionEquations.length > 0) {
-                    let optionEquations = [];
-                    draggableOptionContainer.draggableOption()
-                        .find('math')
-                        .each(($math) => {
-                            optionEquations.push($math.get(0).outerHTML);
-                        }).then(() => {
-                            expect(optionEquations).to.have.deep.members(expectedQuestionData.optionEquations);
-                        });
-                }
-                if (expectedQuestionData.optionImages.length > 0) {
-                    let optionImages = [];
-                    draggableOptionContainer.draggableOption()
-                        .find('img')
-                        .each(($img) => {
-                            optionImages.push($img.get(0).alt);
-                        }).then(() => {
-                            expect(optionImages).to.have.deep.members(expectedQuestionData.optionImages);
+                contentBlocksPage.contentWrapperPreviewTab()
+                    .find('p')
+                    .each(($element, index) => {
+                        let innerText = $element[0].innerText;
+                        expect(innerText).to.be.eq(expectedQuestionData.passageArray[index]);
+                    });
+                if (expectedQuestionData.pagination) {
+                    cy.get('.content-blocks-pagination')
+                        .should('exist');
+                    //Unable to check the passage on all pages, checked only for first page
+                    contentBlocksPage.paginationText()
+                        .then(($element) => {
+                            let pageCount = $element[0].innerText;
+                            let pageCountText = pageCount.trim().replace(/\s+/g, '');
+                            expect(pageCountText).to.be.eq(expectedQuestionData.pageCount);
                         });
                 }
             });
-    },
-
-    figDragAndDropGrading: (expectedQuestionData, index) => {
-        cy.get('.ngie-cloze-with-drag-and-drop')
-            .eq(index)
-            .within(() => {
-                iePage.steps.verifyQuestionInstructions(expectedQuestionData);
-                /* fillInTheGapsTextPage.questionContainerPreviewTab()
-                    .then(($question) => {
-                        let innerText = $question[0].innerText;
-                        expect(expectedQuestionData.previewQuestion).to.be.eq(innerText);
-                    });
-                fillInTheGapsDragAndDropPage.dropzonePreviewTab()
-                    .then(($resposneWrapper) => {
-                        expect($resposneWrapper.length).to.be.eq(expectedQuestionData.previewResponseCount);
-                    }); */
-                fillInTheGapsDragAndDropCommonComponents.correctAnswersOptions()
-                    .then(($answerWrapper) => {
-                        expect($answerWrapper.length).to.be.eq(expectedQuestionData.correctAnswers.length);
-                    });
-                expectedQuestionData.correctAnswers.forEach((correctAnswerData, index) => {
-                    iePage.figCorrectAnswerBlock()
-                        .eq(index)
-                        .within(() => {
-                            cy.get('.answer-numeration-number-box')
-                                .then(($answerNumeration) => {
-                                    expect($answerNumeration[0].innerText).to.be.eq(correctAnswerData.answerNumeration);
-                                });
-                            cy.get('.question-text-wrapper').then(($answerOption) => {
-                                expect($answerOption[0].innerText).to.be.eq(correctAnswerData.options[0].innerText);
-                                if (correctAnswerData.equation) {
-                                    cy.get('.question-text-wrapper')
-                                        .eq(index)
-                                        .find('math')
-                                        .then(($math) => {
-                                            expect($math[0].outerHTML).to.be.eq(correctAnswerData.equation);
-                                        });
-                                }
-                                if (correctAnswerData.altText) {
-                                    cy.get('.question-text-wrapper')
-                                        .eq(index)
-                                        .find('img')
-                                        .then(($img) => {
-                                            expect($img[0].alt).to.be.eq(correctAnswerData.altText);
-                                        });
-                                }
-                            });
-                        });
-                });
-            });
     }
 
     /*     singleSelection: (expectedQuestionData, index) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.176-figDndMigration-409c782.0",
+  "version": "1.0.177-contentBlocksScript-b1350d4.0",
   "description": "",
   "main": "index.js",
   "scripts": {