Merge pull request #1254 from necyberteam/md-dev

Md dev

tests/behat/features/templates/homepage/homepage_edit-account-auth.feature

@@ -36,25 +36,25 @@ Scenario: Authenticated user tests the edit account page
   Scenario: Authenticated user tests the add interest/skills page
     Given I am logged in with email "[email protected]"
     When I go to "/community-persona"
-    Then I should not see "access-account"
+    Then I should not see "ACCESS-account"
 
-    # toggle interest in "access-account"
+    # toggle interest in "ACCESS-account"
     When I go to "/community-persona/add-interest"
     Then I should see "Add Interest"
-    When I click the element with selector "access-account"
+    When I click the element with selector "ACCESS-account"
     When I go to "/community-persona"
-    Then I should see "access-account"
+    Then I should see "ACCESS-account"
     When I go to "/community-persona/add-interest"
-    When I click the element with selector "access-account"
+    When I click the element with selector "ACCESS-account"
     When I go to "/community-persona"
-    Then I should not see "access-account"
+    Then I should not see "ACCESS-account"
 
-    # toggle skill with "access-account"
+    # toggle skill with "ACCESS-account"
     When I go to "/community-persona/add-skill"
-    When I click the element with selector "access-account"
+    When I click the element with selector "ACCESS-account"
     When I go to "/community-persona"
-    Then I should see "access-account"
+    Then I should see "ACCESS-account"
     When I go to "/community-persona/add-skill"
-    When I click the element with selector "access-account"
+    When I click the element with selector "ACCESS-account"
     When I go to "/community-persona"
-    Then I should not see "access-account"
+    Then I should not see "ACCESS-account"

tests/behat/features/templates/tags/tags-individual.feature

@@ -47,6 +47,7 @@ Feature: test individual tags page
     # tag is "login"
     When I select "682" from "edit-field-tags"
     And I fill in "Slug" with "test-affinity-group"
+    And I fill in "Group ID" with "test.group.id"
     When I press "Save"
     Then I should see "has been created"
 

tests/cypress/cypress/e2e/accessmatch/affinity-groups/ag-individual-group-admin.cy.js

@@ -45,6 +45,7 @@ describe("Admin user tests the Individual Affinity Groups", () => {
 
     // Set the slug to something unique
     cy.get('#edit-field-group-slug-0-value').clear().type('access-support');
+    cy.get('#edit-field-group-id-0-value').clear().type('test.group.id');
 
     // submit changes
     cy.get('#edit-submit').click();
@@ -84,7 +85,7 @@ function create_dummy_ci_link() {
   cy.get('#edit-category').select('learning');
   cy.get('#edit-skill-level-304').check();  // beginner level
   cy.get('#edit-description').type("Dummy description for ci-link 'access-support-ci-link-for-testing'");
-  // tag "access-account" is selected
+  // tag "ACCESS-account" is selected
   cy.get('span[data-tid="733"]').click();
   cy.get('#edit-submit').click();
 }

tests/cypress/cypress/e2e/accessmatch/affinity-groups/ag-individual-group-auth.cy.js

@@ -31,7 +31,10 @@ function add_pecan_as_ag_coord() {
     .get('#ui-id-2')  // this is the dropdown that shows up
     .find('.ui-menu-item') //
     .first() // take the first one
-    .click();;
+    .click();
+
+  cy.get('#edit-field-group-id-0-value').clear().type('test.group.id');
+
 
   // submit changes
   cy.get('#edit-submit').click();
@@ -69,7 +72,7 @@ function remove_pecan_as_ag_coord() {
 
   // Set the slug to something unique
   cy.get('#edit-field-group-slug-0-value').clear().type('access-support');
-  
+
     // submit changes
   cy.get('#edit-submit').click();
   cy.contains('has been updated');

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

@@ -15,6 +15,6 @@ describe("Authenticated user tests the Add Interests without adding an Affinity
     cy.visit("/community-persona/add-interest");
 
     //Adding Tag
-    cy.contains("access-account").click();
+    cy.contains("ACCESS-account").click();
   });
 });

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

@@ -17,6 +17,6 @@ describe("Authenticated user tests the Add Skills without adding an Affinity Gro
     cy.visit("/community-persona/add-skill");
 
     //Adding Tag
-    cy.contains("access-account").click();
+    cy.contains("ACCESS-account").click();
   });
 });

tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js

@@ -94,8 +94,8 @@ function create_dummy_ci_link() {
   cy.get('#edit-category').select('Learning');
   cy.get('#edit-skill-level-304').check();  // beginner level
   cy.get('#edit-description').type("Dummy description for ci-link 'dummy-ci-link-for-testing-knowledge-base'");
-  // tag "access-account" is selected
-  cy.get('.tags').contains('access-account').click();
+  // tag "ACCESS-account" is selected
+  cy.get('.tags').contains('ACCESS-account').click();
   cy.get('#edit-submit').click();
 }
 

tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js

@@ -42,8 +42,8 @@ function create_dummy_ci_link() {
   cy.get("#edit-description").type(
     "Dummy description for ci-link 'dummy-ci-link-for-testing-knowledge-base'"
   );
-  // tag "access-account" is selected
-  cy.get(".tags").contains("access-account").click();
+  // tag "ACCESS-account" is selected
+  cy.get(".tags").contains("ACCESS-account").click();
   cy.get("#edit-submit").click();
   cy.drupalLogout();
 }

tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js

@@ -23,7 +23,7 @@ describe("Unauthenticated user tests the Individual KB Resource Page", () => {
         //   "dummy-ci-link-for-testing-knowledge-base"
         // );
         //Tags
-        cy.contains("access-account");
+        cy.contains("ACCESS-account");
         //Description
         cy.contains(
           "Dummy description for ci-link 'dummy-ci-link-for-testing-knowledge-base'"

tests/cypress/cypress/e2e/accessmatch/match-services/match-plus-engagement-form.cy.js

@@ -1,4 +1,4 @@
-/*  
+/*
     This test is focused on the MATCH+ Engagement form tested for an authenticated user.
 
     A MATCH Engagement can be submitted by any authenticated user.
@@ -7,18 +7,18 @@
     The Engagement can be saved as a draft or sent for review.
 
     Users with the MATCH PM role receive an email notification when a MATCH Engagement is submitted.
-    When a MATCH PM saves the engagement as "Received", the user who submitted 
+    When a MATCH PM saves the engagement as "Received", the user who submitted
     the engagement receives an email notification and additional fields are displayed.
     - todo: add tests for additional fields
-    
+
     The author adds additional information and saves the engagement as "In Review".
 
     The MATCH SC receives an email notification when the engagement is saved as "In Review".
     The MATCH SC reviews the engagement and saves it as "Recruiting".
     When in "Recruiting" state, the engagement is displayed on the MATCH Engagements page
     and potential participants can flag interest in the engagement.
 
-    Other states for the engagement include "Reviewing Applicants", "In Progress", 
+    Other states for the engagement include "Reviewing Applicants", "In Progress",
     "Finishing Up", "On Hold", "Halted", and "Complete".
 */
 
@@ -42,7 +42,7 @@ describe("Authenticated user tests the MATCH+ Engagement Form", () => {
 
     // Tags field
     cy.get('.tags summary').click()
-    // tid 733 is the tag "access-account"
+    // tid 733 is the tag "ACCESS-account"
     cy.get('.tags-select[data-tid=733]').click()
 
     //Preffered Semester Field

tests/cypress/cypress/e2e/accessmatch/match-services/match-premier-engagement-form.cy.js

@@ -1,10 +1,10 @@
-/*  
+/*
     This test is specifically focused on the MATCH Premier Engagement form tested for an authenticated user.
     This test checks for major functions like:
-    Page Title, 
+    Page Title,
     Header text,
-    Form Functionality 
-    
+    Form Functionality
+
 */
 
 describe("Authenticated user tests the MATCH Premier Engagement Form", () => {
@@ -27,7 +27,7 @@ describe("Authenticated user tests the MATCH Premier Engagement Form", () => {
 
     // Tags field
     cy.get('.tags summary').click()
-    // tid 733 is the tag "access-account"
+    // tid 733 is the tag "ACCESS-account"
     cy.get('.tags-select[data-tid=733]').click()
 
     //Preffered Semester Field

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

@@ -47,7 +47,7 @@ describe("Admin user uses form to create a KB Resource", () => {
       "http://example-2.com"
     );
 
-    // tag "access-account" is selected
+    // tag "ACCESS-account" is selected
     cy.get('span[data-tid="733"]').click();
 
     // tag "finite-element-analysis" is selected
@@ -76,9 +76,9 @@ describe("Admin user uses form to create a KB Resource", () => {
       "href",
       "http://example-2.com"
     );
-    cy.get('.form-item-tags').contains("access-account")
+    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");