Merge branch 'main' into release

src/components/InstructionPage.vue

@@ -47,10 +47,7 @@
             <div
               v-for="(questionSetState, index) in questionSetStates" :key="index">
                 <li class="text-base mt-2 ml-7 font-semibold leading-none mr-4" :data-test="`questionSetTitle-${index}`">{{ questionSetState.title }}</li>
-                <div class="ml-12 mr-4 mt-1" :data-test="`no-of-questions-${index}`">
-                  There are {{ questionSetState.paletteItems.length }} questions, out of which only {{ questionSetState.maxQuestionsAllowedToAttempt }} questions need to be attempted.
-                </div>
-                <div class="text-base mx-2 mb-4 leading-tight text-slate-500 ml-12 mr-4" :data-test="`questionSetInstruction-${index}`" v-html="questionSetState.instructionPageText"></div>
+                <div class="text-base mx-2 mb-4 leading-tight text-slate-500 ml-12 mr-4" :data-test="`questionSetInstruction-${index}`" v-html="questionSetState.instructionText"></div>
             </div>
         </div>
         <!-- general Instruction -->

src/types.ts

@@ -226,7 +226,6 @@ export interface questionSetPalette {
   title: string | null;
   paletteItems: paletteItemState[];
   instructionText: string;
-  instructionPageText?: string;
   maxQuestionsAllowedToAttempt: number;
 }
 

src/views/Player.vue

@@ -710,20 +710,17 @@ export default defineComponent({
         }
         // the below instruction assumes all questions within a set are of the same type
         let paletteInstructionText: string = state.questionSets[index].description ?? "";
-        // added instructionPageText variable for instructionPage component to not print extra information that is present in paletteInstructionText
-        const localInstructionPageText: string = state.questionSets[index].description ?? "";
 
         if (state.questionSets[index].max_questions_allowed_to_attempt < state.questionSets[index].questions.length) {
-          paletteInstructionText += `\nYou may attempt only up to ${state.questionSets[index].max_questions_allowed_to_attempt} questions in this section.`
+          paletteInstructionText += `<br>You may attempt only up to ${state.questionSets[index].max_questions_allowed_to_attempt} questions in this section.`
         } else {
-          paletteInstructionText += `\nYou may attempt all questions in this section.`
+          paletteInstructionText += `<br>You may attempt all questions in this section.`
         }
 
         qsetStates.push({
           title: state.questionSets[index].title,
           paletteItems: states,
           instructionText: paletteInstructionText,
-          instructionPageText: localInstructionPageText,
           maxQuestionsAllowedToAttempt: state.questionSets[index].max_questions_allowed_to_attempt,
         })
       }

tests/e2e/specs/renders-omr-assessment.js

@@ -331,7 +331,7 @@ describe("Player for OMR quizzes", () => {
           cy.get('[data-test="questionSetInstruction-1"').should("exist");
           cy.get('[data-test="questionSetInstruction-1"').should(
             "have.text",
-            "Question Set 1 Description\nYou may attempt only up to 3 questions in this section."
+            "Question Set 1 DescriptionYou may attempt only up to 3 questions in this section."
           );
         });
 

tests/e2e/specs/renders-player-assessment.js

@@ -245,7 +245,7 @@ describe("Player for Assessment quizzes", () => {
           cy.get('[data-test="paletteInstruction-0"').should("exist");
           cy.get('[data-test="paletteInstruction-0"').should(
             "have.text",
-            "Question Set 0 Description\nYou may attempt all questions in this section."
+            "Question Set 0 DescriptionYou may attempt all questions in this section."
           );
         });
 

tests/e2e/specs/renders-player-partial-marks-assessment.js

@@ -195,7 +195,7 @@ describe("Player for Assessment quizzes with partial marks", () => {
           cy.get('[data-test="paletteInstruction-0"').should("exist");
           cy.get('[data-test="paletteInstruction-0"').should(
             "have.text",
-            "Question Set 0 Description\nYou may attempt all questions in this section."
+            "Question Set 0 DescriptionYou may attempt all questions in this section."
           );
         });
       });

tests/e2e/specs/renders-player-to-check-optional.js

@@ -135,7 +135,7 @@ describe("Player for Assessment quizzes", () => {
         cy.get('[data-test="paletteInstruction-1"').should("exist");
         cy.get('[data-test="paletteInstruction-1"').should(
           "have.text",
-          "Question Set 1 Description\nYou may attempt only up to 3 questions in this section."
+          "Question Set 1 DescriptionYou may attempt only up to 3 questions in this section."
         );
       });
 

tests/unit/components/InstructionPage.spec.ts

@@ -10,7 +10,6 @@ describe('InstructionPage', () => {
     };
     const testQuestionSetStates = [
       {
-        instructionPageText: "You may attempt 2 out of 5 questions",
         instructionTest: "You may attempt all the questions",
         maxQuestionsAllowedToAttempt: 2,
         paletteItems: [
@@ -26,7 +25,6 @@ describe('InstructionPage', () => {
         title: "Maths - Set 0",
       },
       {
-        instructionPageText: "You may attempt 2 out of 5 questions",
         instructionTest: "You may attempt all the questions",
         maxQuestionsAllowedToAttempt: 2,
         paletteItems: [
@@ -78,7 +76,6 @@ describe('InstructionPage', () => {
     };
     const testQuestionSetStates = [
       {
-        instructionPageText: "You may attempt 2 out of 5 questions",
         instructionTest: "You may attempt all the questions",
         maxQuestionsAllowedToAttempt: 2,
         paletteItems: [
@@ -94,7 +91,6 @@ describe('InstructionPage', () => {
         title: "Maths - Set 0",
       },
       {
-        instructionPageText: "You may attempt 2 out of 5 questions",
         instructionTest: "You may attempt all the questions",
         maxQuestionsAllowedToAttempt: 2,
         paletteItems: [
@@ -145,21 +141,5 @@ describe('InstructionPage', () => {
       questionSetIndex = 1;
       expect(wrapper.find(`[data-test="questionSetTitle-${questionSetIndex}"]`).text()).toBe("Maths - Set 1");
     });
-
-    it("displays instruction text for each set", () => {
-      let questionSetIndex = 0;
-      expect(wrapper.find(`[data-test="questionSetInstruction-${questionSetIndex}"]`).text()).toBe("You may attempt 2 out of 5 questions");
-
-      questionSetIndex = 1;
-      expect(wrapper.find(`[data-test="questionSetInstruction-${questionSetIndex}"]`).text()).toBe("You may attempt 2 out of 5 questions");
-    });
-
-    it("No. of questions need to be attempted for each set", () => {
-      let questionSetIndex = 0;
-      expect(wrapper.find(`[data-test="no-of-questions-${questionSetIndex}"]`).text()).toBe("There are 2 questions, out of which only 2 questions need to be attempted.");
-
-      questionSetIndex = 1;
-      expect(wrapper.find(`[data-test="no-of-questions-${questionSetIndex}"]`).text()).toBe("There are 2 questions, out of which only 2 questions need to be attempted.");
-    })
   });
 });