Merge pull request #1266 from necyberteam/md-dev

MD Dev

.github/workflows/backupdb.yml

@@ -53,6 +53,7 @@ jobs:
           lando drush en amp_dev
           lando drush pmu amp_dev
           lando drush pmu symfony_mailer
+          lando drush en symfony_mailer
           lando drush cr
           lando db-export site.sql
         env:

composer.json

@@ -216,7 +216,8 @@
       "oomphinc/composer-installers-extender": true,
       "acquia/blt": true,
       "phpstan/extension-installer": true,
-      "php-http/discovery": true
+      "php-http/discovery": true,
+      "tbachert/spi": true
     }
   },
   "extra": {

tests/behat/features/cci/cci-homepage.feature

@@ -29,8 +29,8 @@ Feature: verify specific items on CCI homepage
     And I should see "List View"
     And I should see "CAREERS Cyberteam"
     And I should see "Great Plains Cyberteam"
-    And I should see "ACCESS Facilitators"
-    And I should see "People who use or support people who use ACCESS resources and the ACCESS Resource Allocation System."
+    And I should see "ACCESS Support"
+    And I should see "Supporting the ACCESS Research Community"
     When I click "List View"
     Then I should see "Programs"
     And I should see "Affinity Groups"

tests/cypress/cypress/e2e/accessmatch/announcements/announcements-page.cy.js

@@ -32,7 +32,7 @@ describe("Unauthenticated user tests the Announcements Page", () => {
       .click();
     cy.get(".field__item > .font-normal").contains("ai");
     cy.get(".field__label").contains("Affiliation");
-    cy.get(".layout__region--second > .block > .field > .field__item").contains(
+    cy.get(".layout__region--second").contains(
       "Community"
     );
 

tests/cypress/cypress/e2e/accessmatch/community-persona/community-persona.cy.js

@@ -10,9 +10,9 @@ describe('Anonymous user visit the community-persona page', () => {
   it('should find expected stuff', () => {
     anon_cp_redirect_login();
     anon_verify_user201_cp();
-    user200_verify_self_cp();
-    user200_edit_self();
-    admin_unedit_user200();
+    user199_verify_self_cp();
+    user199_edit_self();
+    admin_unedit_user199();
   });
 });
 
@@ -60,9 +60,9 @@ function anon_verify_user201_cp() {
 }
 
 /**
- *  user200 user visits their own community-persona page
+ *  user199 user visits their own community-persona page
  */
-function user200_verify_self_cp() {
+function user199_verify_self_cp() {
   cy.loginAs('[email protected]', 'Walnut');
 
   cy.visit('/community-persona');
@@ -83,7 +83,7 @@ function user200_verify_self_cp() {
     $persona.contains('Edit Roles')
       .should('have.attr', 'href', "/form/edit-your-cssn-roles?destination=community-persona");
     $persona.contains('Edit Persona')
-      .should('have.attr', 'href', "/user/200/edit?destination=community-persona");
+      .should('have.attr', 'href', "/user/199/edit?destination=community-persona");
     // todo test this page
   });
 
@@ -100,19 +100,19 @@ function user200_verify_self_cp() {
 }
 
 /**
- * user200 edits their own community-persona page
+ * user199 edits their own community-persona page
  * and verifies the changes.
  */
-function user200_edit_self() {
-  cy.visit('/user/200/edit?destination=community-persona');
+function user199_edit_self() {
+  cy.visit('/user/199/edit?destination=community-persona');
   cy.get('#edit-field-region').contains('Great Plains').click();  // great plains
 
   // if there's a pic or resume, remove them - could be leftover from broken tests.
   cy.get('body').then(($body) => {
-    if ($body.text().includes('edit-user-picture-0-remove-button')) {
+    if ($body.find("#edit-user-picture-0-remove-button").length > 0) {
       cy.get('#edit-user-picture-0-remove-button').click();
     }
-    if ($body.text().includes('edit-field-cv-resume-0-remove-button')) {
+    if ($body.find("#edit-field-cv-resume-0-remove-button").length > 0) {
       cy.get('#edit-field-cv-resume-0-remove-button').click();
     }
   }).then(() => {
@@ -135,18 +135,18 @@ function user200_edit_self() {
     $persona.get('img').should('have.attr', 'src').should('include', 'eclipse')
     $persona.contains('Great Plains');
   });
-  cy.visit('/user/200/edit');
+  cy.visit('/user/199/edit');
   cy.contains('dummy-image');
   cy.contains('dummy-resume')
 }
 
 /**
- * admin user undoes the edits user200 made to their community-persona page
+ * admin user undoes the edits user199 made to their community-persona page
  * and verifies the changes
  */
-function admin_unedit_user200() {
+function admin_unedit_user199() {
   cy.loginAs('[email protected]', 'b8QW]X9h7#5n');
-  cy.visit('/user/200/edit?destination=community-persona');
+  cy.visit('/user/199/edit?destination=community-persona');
   cy.get('#edit-field-region').contains('Northeast').click();
   cy.get('#edit-field-hpc-experience-0-value').clear();
   cy.get('#edit-user-picture-0-remove-button').click();

tests/cypress/cypress/e2e/accessmatch/community/cssn/join-cssn-form.cy.js

@@ -30,7 +30,7 @@ describe("Authenticated user tests the form to join the CSSN", () => {
       console.log(el.text())
       // test if the text is one of the two possible messages
       if (el.text().includes('Thank you for joining the CSSN.')) {
-      } else if (el.text().includes('Submission updated in CSSN.')) {
+      } else if (el.text().includes('Submission updated')) {
       } else {
         throw new Error('Unexpected message: ' + el.text());
       }

tests/cypress/cypress/e2e/accessmatch/contact-send-email-form.cy.js

@@ -2,7 +2,7 @@
 * Verify the contact form can be used to send an email.
 *
 */
-describe('user200 visits user201s community-persona page to send email', () => {
+describe('user199 visits user201s community-persona page to send email', () => {
   it('should find expected stuff', () => {
     cy.loginAs('[email protected]', 'Walnut');
     cy.visit('/community-persona/201');

tests/cypress/cypress/e2e/accessmatch/events/events-add.cy.js

@@ -12,9 +12,18 @@
 */
 
 describe("Authenticated user tests the Events Form without Affinity Group", () => {
-  it("Should test Events Form for authenticated user", () => {
+  it("Should test Events Form for authenticated user",
+    {
+      retries: {
+        runMode: 3,
+        openMode: 1,
+      },
+    },
+    () => {
     // login user with the "authenticated" role
     cy.loginAs("[email protected]", "b8QW]X9h7#5n");
+    cy.visit("/");
+    cy.get(':nth-child(1) > .views-field-title-2 > .field-content > .block')
     cy.visit("/events/add");
 
     // Page Title
@@ -51,15 +60,16 @@ describe("Authenticated user tests the Events Form without Affinity Group", () =
     cy.get("#edit-moderation-state-0-state").select("Published");
 
     //Event Type
-    cy.get("#edit-field-event-type").select("Training");
+    cy.get("#edit-field-event-type-training").click();
 
     //Event Affiliation
     cy.get("#edit-field-affiliation-community").click();
 
     //Event Skill Level
-    cy.get("#edit-field-skill-level").select("Advanced");
+    cy.get("#edit-field-skill-level-advanced").click();
 
     //Form Submit Button and confirmation
+    cy.config("defaultCommandTimeout", 10000);
     cy.get("#edit-submit").click();
     cy.contains("Successfully saved the example-event event series");
   });

tests/cypress/cypress/e2e/accessmatch/events/events-ztest.cy.js

@@ -0,0 +1,21 @@
+/*
+    This test is specifically focused on the Events form tested for an authenticated user.
+    This test checks for major functions like:
+    Page Title,
+    Header text,
+    Form Functionality
+
+
+    // cy.get("#edit-field-affinity-group-node-0-target-id").type(
+    //   "Access Support Testing (413)"
+    // );
+*/
+
+describe("Authenticated user tests the Events Form without Affinity Group", () => {
+  it("Should test Events Form for authenticated user", () => {
+    // login user with the "authenticated" role
+    cy.loginAs("[email protected]", "b8QW]X9h7#5n");
+    cy.visit("/admin/reports/dblog");
+    cy.get('.admin-dblog').screenshot();
+  });
+});

tests/cypress/cypress/e2e/accessmatch/find.cy.js

@@ -20,6 +20,7 @@ describe("Test of the /find page", () => {
     cy.get('.sui-search-box__text-input')
       .type('test{enter}');
 
+    cy.wait(5000);
     cy.get('.btn').contains('Hide Results');
     cy.get('.sui-paging-info').contains('Showing');
     cy.get('.sui-select').contains('Relevance');

tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js

@@ -177,13 +177,13 @@ describe("Verify the the community-outreach tag page", () => {
       cy.get("#edit-moderation-state-0-state").select("Published");
 
       //Event Type
-      cy.get("#edit-field-event-type").select("Training");
+      cy.get("#edit-field-event-type-training").click();
 
       //Event Affiliation
-      cy.get("#edit-field-affiliation").select("Community");
+      cy.get("#edit-field-affiliation-community").click();
 
       //Event Skill Level
-      cy.get("#edit-field-skill-level").select("Advanced");
+      cy.get("#edit-field-skill-level-advanced").click();
 
       //Form Submit Button and confirmation
       cy.get("#edit-submit").click();

tests/cypress/cypress/e2e/accessmatch/webforms/admin-create-ci-link.cy.js

@@ -78,7 +78,7 @@ describe("Admin user uses form to create a KB Resource", () => {
     );
     cy.get('.form-item-tags').contains("ACCESS-account")
       .should("have.attr", "href")
-      .and("contains", "/tags/ACCESS-account");
+      .and("contains", "/tags/access-account");
     cy.get('.form-item-tags').contains("finite-element-analysis")
       .should("have.attr", "href")
       .and("contains", "/tags/finite-element-analysis");

tests/cypress/cypress/e2e/accessmatch/webforms/auth-submit-issue.cy.js

@@ -19,8 +19,8 @@ describe('Authenticated user fills out the enter ticket form', () => {
     cy.get('[name="priority"]').select('Critical');
     cy.get('[name="details"]').type('TEST');
     // select a couple tags
-    cy.get('#edit-tags3-733').check();
-    cy.get('#edit-tags3-690').check();
+    cy.get('[data-drupal-selector="edit-tags3-733"]').check();
+    cy.get('[data-drupal-selector="edit-tags3-690"]').check();
     cy.contains('Submit').click();
     cy.contains('Thank you! Your ticket has been submitted! We\'ll be in touch soon.');
   });