Merge pull request #1181 from necyberteam/md-dev

Md dev
necyberteam · May 21, 2024 · 292953e · 292953e
2 parents 8476a88 + 2a94d03
commit 292953e
Show file tree

Hide file tree

Showing 26 changed files with 195 additions and 48 deletions.
diff --git a/blt/md/md-2050 b/blt/md/md-2050
@@ -0,0 +1 @@
+amp_cyberinfrastructure_org
diff --git a/composer.json b/composer.json
@@ -130,7 +130,8 @@
     "drupal/readonlymode": "^1.1",
     "drupal/real_aes": "^2.3",
     "drupal/realname": "^2.0@beta",
-    "drupal/recaptcha": "^3.0",
+    "drupal/recaptcha": "^3.2",
+    "drupal/recaptcha_v3": "^2.0",
     "drupal/recurring_events": "^2.0@RC",
     "drupal/redirect": "^1.8",
     "drupal/rel_to_abs": "^2.2",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/behat/features/Jasper/wip.feature b/tests/behat/features/Jasper/wip.feature
@@ -23,7 +23,7 @@ Feature: test individual Affinity Group page
     When I go to "node/327/edit"
     Then I should see "Edit Affinity Group ACCESS Support"
     # this CI link is created by amp_dev.install
-    When I fill in "Display CI Links on your Affinity Group" with "ci-link-for-user-200"
+    When I fill in "Display Knowledge Base Resources on your Affinity Group" with "ci-link-for-user-200"
     And I wait 1 seconds
     When I press "Save"
     And I wait 2 seconds
@@ -33,7 +33,7 @@ Feature: test individual Affinity Group page
     Then I should see "ci-link-for-user-200"
 
 
-  #Scenario: Administrator user creates CI Link and adds it to an affinity group
+  #Scenario: Administrator user creates KB Resource and adds it to an affinity group
     Given I am logged in as a user with the "administrator" role
     When I go to "/form/resource"
     Then I should see "Knowledge Base Resources"

diff --git a/tests/behat/features/champ/champ-affinity-auth.feature b/tests/behat/features/champ/champ-affinity-auth.feature
@@ -47,6 +47,6 @@ Affinity Group Request page for authenticated users.
     Then I should see "Email"
     Then I should see "Coordinators"
     Then I should see "Events"
-    Then I should see "Knowledge Base Resources"
+    #Then I should see "Knowledge Base Resources"
     Then I should see "People"
     #Then I should see "Masquerade"
diff --git a/tests/behat/features/champ/champ-affinity-unauth.feature b/tests/behat/features/champ/champ-affinity-unauth.feature
@@ -17,16 +17,16 @@ people are listed, along with constant "Join" functionality and additional butto
     Then I should see "Affinity Group"
     #Then I should see "Join"
     Then I should see "Request An Affinity Group"
-    When I go to "/affinity-groups/cloud-computing"
+    When I go to "/affinity-groups/access-support"
     And I wait for the page to be loaded
     Then I should see "Members get updates"
-    Then I should see "Cloud Computing"
-    Then I should see "cloud-commercial"
-    Then I should see "People who use or are considering"
+    Then I should see "ACCESS Support"
+    Then I should see "ACCESS-website"
+    Then I should see "Become an ACCESS Support insider by joining our affinity group."
     Then I should see "Join"
     Then I should see "Slack"
     Then I should see "Q&A"
-    Then I should see "Email"
+    #Then I should see "Email"
     Then I should see "Events"
     Then I should see "Knowledge Base Resources"
     Then I should see "Announcements"

diff --git a/tests/behat/features/champ/champ-homepage.feature b/tests/behat/features/champ/champ-homepage.feature
@@ -28,7 +28,7 @@ Feature: For non-authenticated users, Campus Champions Specific Tests encompass
     Then I should see "About Us"
     Then I should see "Find Champions"
     Then I should see "Affinity Groups"
-    Then I should see "CI Links"
+    Then I should see "Resources"
     Then I should see "Advancing Science"
     Then I should see "Creating Community"
     Then I should see "Building Knowledge"

diff --git a/tests/behat/features/templates/affinity_groups/affinity_group.feature b/tests/behat/features/templates/affinity_groups/affinity_group.feature
@@ -75,7 +75,7 @@ Feature: Feature: test an Affinity Group page
     # TODO need a future event for the following
     # Then I should see "[4/04/2023 7:00 PM EDT]"
     # Then link "How to Write a Successful" should contain "/events/6593"
-    # TODO - once able to add a CI Link to this AG, uncomment the following
+    # TODO - once able to add a KB Resource to this AG, uncomment the following
     #Then I should see "ci-link-for-user-200"
     Then link "Who can get an allocation to use HPC resources through ACCESS?" should contain "/t/who-can-get-an-allocation-to-use-hpc-resources-through-access/3019"
     #When I click "How to Write a Successful"

diff --git a/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature b/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature
@@ -14,7 +14,7 @@ Feature: test KB Resources form
     When I click the "#edit-submit" element
 
     When I go to "/knowledge-base/resources"
-    When I follow "Add a CI Link"
+    When I follow "Add a Resource"
     Then I should be on "/form/resource"
     And I should see "Title"
     And I should see "Category"
@@ -68,7 +68,7 @@ Feature: test KB Resources form
     Given I am logged in as a user with the "administrator" role
     When I go to homepage
     When I go to "/knowledge-base/resources"
-    When I follow "Add a CI Link"
+    When I follow "Add a Resource"
     Then I should be on "form/resource"
     Then I should see "Add"
     When I fill in "title" with "test-login-resource"

diff --git a/tests/behat/features/templates/ci-links/ci-links-add-auth.feature b/tests/behat/features/templates/ci-links/ci-links-add-auth.feature
@@ -11,7 +11,7 @@ Resource with Link Title and Link URL (must include https).
   Scenario: Authenticated user fills out the resource form
     Given I am logged in as a user with the "authenticated" role
     When I go to "/knowledge-base/resources"
-    When I follow "Add a CI Link"
+    When I follow "Add a Resource"
     Then I should be on "form/resource"
     And I should see "Title"
     And I should see "Category"

diff --git a/tests/behat/features/templates/ci-links/ci-links-auth.feature b/tests/behat/features/templates/ci-links/ci-links-auth.feature
@@ -10,7 +10,7 @@ descriptions, categories, tags (first 3 linked), skill levels, and affinity grou
   Scenario: Authenticated user Test the resource page
     Given I am logged in as a user with the "authenticated" role
     When I go to "/knowledge-base/resources"
-    Then I should see "Add a CI Link"
-    Then I should see "Use these links “vetted” by the community"
+    Then I should see "Add a Resource"
+    Then I should see "Cyberinfrastructure professionals"
     Then I should see "Test CI Link Title"
 
diff --git a/tests/behat/features/templates/ci-links/ci-links-unauth.feature b/tests/behat/features/templates/ci-links/ci-links-unauth.feature
@@ -3,7 +3,7 @@
 @javascript
 
 Feature: This Behat test goes over the KB Resources Page, when accessed by an
-unauthenticated user, this page does not display the "Add a CI Links" button. The search
+unauthenticated user, this page does not display the "Add a Resource" button. The search
 function works on approved KB Resources' titles only, is case-insensitive, and shows
 a special message if no results are found.
  There is also a text description at the top of the page.
@@ -12,8 +12,8 @@ a special message if no results are found.
     Given I am not logged in
     When I go to "/knowledge-base/resources"
     Then I should see "Knowledge Base Resources"
-    Then I should see "Use these links “vetted” by the community"
-    Then I should see "Add a CI Link"
+    Then I should see "Cyberinfrastructure professionals"
+    Then I should see "Add a Resource"
     Then I should see "Test CI Link Title"
-    When I click "Add a CI Link"
+    When I click "Add a Resource"
     Then I should be on "/user/login?destination=/form/resource"
diff --git a/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature b/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature
@@ -26,7 +26,7 @@ Feature: The Front Page includes a site slogan, which is region-specific,
     When I click "Ask the Community"
     Then I should be on "https://ask.cyberinfrastructure.org/"
     When I am on the homepage
-    When I click "Find CI Links"
+    When I click "Find Knowledge Base Resources"
     Then I should be on "/knowledge-base/resources"
     When I am on the homepage
     Then I should see the link "Project Submission Form"

diff --git a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js
@@ -13,19 +13,19 @@ describe("Unauthenticated user tests the ASP Homepage", () => {
 
     //Announcements block section
     cy.get(".block-views-blockaccess-news-latest-news-block").contains(
-      "announcements"
+      "Announcements"
     );
     cy.get(".block-views-blockaccess-news-latest-news-block").contains(
-      "See all announcements"
+      "See all"
     );
 
     //Events block section
     cy.get(
       ".block-views-blockrecurring-events-event-instances-latest-events-block"
-    ).contains("Upcoming Events");
+    ).contains("Training and Events");
     cy.get(
       ".block-views-blockrecurring-events-event-instances-latest-events-block"
-    ).contains("See all events");
+    ).contains("See all");
 
     //Search Access block section and button destination
     cy.get(":nth-child(1) > .mt-0").contains("Search ACCESS");
@@ -38,7 +38,7 @@ describe("Unauthenticated user tests the ASP Homepage", () => {
     cy.verifyCallToActionBlock(
       "/",
       "Find useful resources now",
-      "/knowledge-base/ci-links"
+      "/knowledge-base/resources"
     );
   });
 });