#2462: trying cypress upgrade

NationalSecurityAgency · Dec 22, 2023 · 2fc86c2 · 2fc86c2
1 parent 48d5c27
commit 2fc86c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/build-and-test-oauth.yml b/.github/workflows/build-and-test-oauth.yml
@@ -79,7 +79,7 @@ jobs:
       fail-fast: false
       matrix:
         # run 6 copies of the current job in parallel
-        containers: [1, 2, 3, 4, 5, 6]
+        containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
 
     services:
       postgres:
@@ -171,21 +171,6 @@ jobs:
       with:
         working-directory: e2e-tests
         record: true
-#         spec: |
-#           cypress/e2e/badges_spec.js
-#           cypress/e2e/global_badges_spec.js
-#           cypress/e2e/settings_spec.js
-#           cypress/e2e/users_spec.js
-#           cypress/e2e/contact_admins_spec.js
-#           cypress/e2e/projects_modal_management_spec.js
-#           cypress/e2e/manage-my-projects_spec.js
-#           cypress/e2e/video/configure_video_features_spec.js
-#           cypress/e2e/skills-display-integration_spec.js
-#           cypress/e2e/learning-path/learning_path_management_spec.js
-#           cypress/e2e/learning-path/learning-path/learning_path_management_validation_spec.js
-#           cypress/e2e/skills-display-integration_spec.js
-#           cypress/e2e/configure-skill-expiration_spec.js
-#           cypress/e2e/register_root_user_spec.js
         parallel: true
         group: 'skills-service with OAuth'
         tag: "${{ github.workflow }}"

diff --git a/e2e-tests/cypress/e2e/community/community_proj_email_header_spec.js b/e2e-tests/cypress/e2e/community/community_proj_email_header_spec.js
@@ -546,6 +546,7 @@ describe('Community Project Email Header/Footer Tests', () => {
 
         cy.get('[data-cy="nav-Contact Admins"]').click();
         cy.wait('@isRoot');
+        cy.get('[data-cy="projectAdminCount"]').should('have.text', '2')
 
         cy.get('[data-cy=emailUsers_subject]')
           .type('Test Subject');

diff --git a/e2e-tests/cypress/e2e/global_badges_spec.js b/e2e-tests/cypress/e2e/global_badges_spec.js
@@ -851,7 +851,7 @@ describe('Global Badges Tests', () => {
 
         cy.clickButton('Badge');
 
-        cy.get('#badgeName')
+        cy.get('[data-cy="badgeName"]')
             .type('A Badge', { delay: 100 })
         cy.wait('@nameExists');
         cy.clickSave();

diff --git a/e2e-tests/package.json b/e2e-tests/package.json
@@ -79,12 +79,12 @@
     "@bahmutov/print-env": "2.1.2",
     "axe-core": "4.4.3",
     "badge-maker": "3.3.1",
-    "cypress": "13.3.2",
+    "cypress": "13.6.1",
     "cypress-audit": "1.1.0",
     "cypress-axe": "1.5.0",
     "cypress-file-upload": "5.0.8",
     "cypress-plugin-tab": "1.0.5",
-    "cypress-real-events": "1.10.3",
+    "cypress-real-events": "1.11.0",
     "cypress-visual-regression": "3.0.0",
     "cypress-wait-until": "1.7.2",
     "dayjs": "1.10.4",