#2517 - cypress test to show/hide approval message on self report tim…

…eline
NationalSecurityAgency · Jan 10, 2025 · 4498a32 · 4498a32
1 parent 461e694
commit 4498a32
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/dashboard/src/skills-display/components/skill/ApprovalEventMessage.vue b/dashboard/src/skills-display/components/skill/ApprovalEventMessage.vue
@@ -41,8 +41,8 @@ const toggleShowMessage = () => {
         severity="info"
         size="small"
         @click="toggleShowMessage"
-        data-cy="viewTimeline"/>
-  <markdown-text v-if="isDescriptionShowing" :text="props.message" :instance-id="props.id" />
+        data-cy="toggleShowMessageBtn"/>
+  <markdown-text v-if="isDescriptionShowing" :text="props.message" :instance-id="props.id" data-cy="approvalEventMessage" />
   </div>
 </template>
 

diff --git a/e2e-tests/cypress/e2e/client-display/client-display-self_report_skills_spec.js b/e2e-tests/cypress/e2e/client-display/client-display-self_report_skills_spec.js
@@ -25,11 +25,12 @@ describe('Client Display Self Report Skills Tests', () => {
         cy.createProject(1);
         cy.createSubject(1, 1);
 
-        Cypress.Commands.add('approveRequest', (requestNum = 0) => {
+        Cypress.Commands.add('approveRequest', (requestNum = 0, approvalMsg = '') => {
             cy.request('/admin/projects/proj1/approvals?limit=10&ascending=true&page=1&orderBy=userId')
                 .then((response) => {
                     cy.request('POST', '/admin/projects/proj1/approvals/approve', {
                         skillApprovalIds: [response.body.data[requestNum].id],
+                        approvalMessage: approvalMsg,
                     });
                 });
         });
@@ -304,7 +305,7 @@ describe('Client Display Self Report Skills Tests', () => {
             .should('contain.text', 'Approval Requested')
 
         // approve and then visit page again
-        cy.approveRequest();
+        cy.approveRequest(0, 'I approve this message!');
         cy.cdVisit('/');
         cy.cdClickSubj(0);
         cy.cdClickSkill(0);
@@ -319,6 +320,27 @@ describe('Client Display Self Report Skills Tests', () => {
             .children('.p-timeline-event')
             .eq(1)
             .should('contain.text', 'Approval Requested')
+        cy.get('[data-cy="approvalHistoryTimeline"]')
+            .children('.p-timeline-event')
+            .eq(1)
+            .get('[data-cy="toggleShowMessageBtn"]')
+            .click();
+        cy.get('[data-cy="approvalHistoryTimeline"]')
+            .children('.p-timeline-event')
+            .eq(1)
+            .get('[data-cy="approvalEventMessage"]')
+            .should('contain.text', 'I approve this message!')
+        cy.get('[data-cy="approvalHistoryTimeline"]')
+            .children('.p-timeline-event')
+            .eq(1)
+            .get('[data-cy="toggleShowMessageBtn"]')
+            .click();
+        cy.get('[data-cy="approvalHistoryTimeline"]')
+            .children('.p-timeline-event')
+            .eq(1)
+            .get('[data-cy="approvalEventMessage"]')
+            .should('not.exist')
+
         cy.get('[data-cy="overallPointsEarnedCard"] [data-cy="mediaInfoCardTitle"]')
             .contains('50');
         cy.get('[data-cy="pointsAchievedTodayCard"] [data-cy="mediaInfoCardTitle"]')