Merge pull request #357 from NationalSecurityAgency/4.5.X

4.5.x

Author: rmmayo

cypress/e2e/admin.cy.js

@@ -617,6 +617,40 @@ context('Admin: Generate Screenshots', () => {
 
         cy.snap('rich-text-editor-5', markdownInput);
 
+        cy.get(markdownInput).clear()
+        cy.focused().type('Table:')
+        // Click the table button in the toolbar
+        cy.clickToolbarButton('table')
+
+        // Target the table selection container
+        cy.get('.toastui-editor-popup-body .toastui-editor-table')
+          .within(() => {
+            cy.get('.toastui-editor-table-row').eq(1)
+              .find('.toastui-editor-table-cell').eq(2)
+              .click();
+          });
+
+        // Target the inserted table cells inside the editor
+        cy.get('.toastui-editor-contents table').within(() => {
+          cy.get('thead tr').eq(0)
+            .find('th').eq(0)
+            .as('targetHeaderCell'); // Save cell as alias
+        });
+        cy.get('.toastui-editor-contents table').within(() => {
+        cy.get('tbody tr').eq(0)
+          .find('td').eq(0)
+          .as('targetBodyCell'); // Save cell as alias
+        });
+
+        // Click the cells to focus and type text
+        cy.get('@targetHeaderCell')
+          .click()
+          .type('First Name{rightArrow}Last Name{rightArrow}Address')
+        cy.get('@targetBodyCell')
+          .click()
+          .type('Jane{rightArrow}Doe{rightArrow}123 Main St')
+
+        cy.snap('rich-text-editor-6', markdownInput);
     })
 
     it('access page', () => {

cypress/e2e/progress-and-ranking.cy.js

@@ -9,6 +9,15 @@ context('Progress and Ranking: Generate Screenshots', () => {
 
     cy.addToMyProjects('movies');
     cy.addToMyProjects('shows');
+
+    cy.intercept('GET', '/public/config', (req) => {
+      req.reply((res) => {
+        const conf = res.body;
+        conf.disableScrollToTop = true
+        conf.disableEncouragementsConfetti = true
+        res.send(conf);
+      });
+    }).as('getConfig');
   });
 
   it('Gen Select My Projects', () => {
@@ -38,7 +47,7 @@ context('Progress and Ranking: Generate Screenshots', () => {
     cy.snap('page-progress-and-rankings-my-rank', '#mainContent2');
   });
 
-  it('My Rank Page', () => {
+  it('My Badges Page', () => {
     cy.visit('/progress-and-rankings/projects/movies/badges')
     cy.get('[data-cy="achievedBadges"]').should('be.visible')
     cy.get('[data-cy="availableBadges"] [data-cy="badgeTitle"]').should('be.visible')
@@ -57,14 +66,15 @@ context('Progress and Ranking: Generate Screenshots', () => {
   });
 
   it('Gen Skills Display - project', () => {
-    cy.visit('/test-skills-display/movies');
+    cy.visit('/progress-and-rankings/projects/movies');
+    cy.wait('@getConfig');
     cy.get('[data-cy="skillsDisplayHome"] [data-cy="pointHistoryChart-animationEnded"]')
     cy.get('[data-cy="skillsDisplayHome"] [data-cy="subjectTileBtn"]').should('have.length', 6);
     cy.snap('client-display-proj', '[data-cy="skillsDisplayHome"]');
   });
 
   it('Gen Skills Display - my rank', () => {
-    cy.visit('/test-skills-display/movies/rank');
+    cy.visit('/progress-and-rankings/projects/movies/rank');
     cy.get('[data-cy="skillsDisplayHome"]').contains('My Rank');
     cy.get('[data-cy="levelBreakdownChart-animationEnded"]')
     cy.get('[data-cy="userColumn"]').should('have.length', 10);
@@ -73,13 +83,14 @@ context('Progress and Ranking: Generate Screenshots', () => {
 
   it('Gen Skills Display - subject', () => {
     const clipScreenshot = { x: 0, y: 0, width: displayWidth, height: 1800 };
-
-    cy.visit('/test-skills-display/movies/subjects/Family');
+    cy.visit('/progress-and-rankings/projects/movies/subjects/Family');
+    cy.wait('@getConfig');
     cy.get('[data-cy="skillsDisplayHome"] [data-cy="pointHistoryChart-animationEnded"]')
     cy.get('[data-cy="skillProgress_index-0"]')
     cy.snap('client-display-subject', '[data-cy="skillsDisplayHome"]', { clip: clipScreenshot });
 
     cy.visit('/progress-and-rankings/projects/movies/subjects/Comedy');
+    cy.wait('@getConfig');
     cy.get('[data-cy="skillsDisplayHome"] [data-cy="pointHistoryChart-animationEnded"]')
     cy.get('[data-cy="skillProgress_index-0"]')
     cy.snap('client-display-subject-comedy', '#mainContent2', { clip: clipScreenshot });
@@ -200,4 +211,15 @@ context('Progress and Ranking: Generate Screenshots', () => {
     cy.snap('component-training-wide-search', '[data-cy="trainingSearchDialog"]');
   })
 
+  it('contact form', () => {
+    cy.visit('/progress-and-rankings/projects/movies/')
+    cy.wait('@getConfig');
+    cy.get('[data-cy="skillsDisplaySearchBtn"]')
+    cy.get('[data-cy="contactOwnerBtn"]').click()
+    cy.get('[data-cy="contactProjectOwnerDialog"]').contains('Send your message to the administrators of Movies training')
+    cy.snap('contact_admins_form', '[data-cy="contactProjectOwnerDialog"]');
+  })
+
+
+
 })