Merge pull request #1102 from necyberteam/md-dev

Md dev
necyberteam · Mar 4, 2024 · 8c178a1 · 8c178a1
2 parents dc949d5 + cb9b48d
commit 8c178a1
Show file tree

Hide file tree

Showing 131 changed files with 517 additions and 341 deletions.
diff --git a/.github/workflows/backupdb.yml b/.github/workflows/backupdb.yml
@@ -12,7 +12,7 @@ jobs:
     name: Grab backup and fix backup
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - uses: ./.github/actions/dingorunner
         env:
@@ -47,7 +47,7 @@ jobs:
           gh_token: ${{ secrets.GH_TOKEN_REPO }}
 
       - name: 'Upload Backup Artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: amp-daily-backup
           path: site.sql.gz

diff --git a/.github/workflows/backupfiles.yml b/.github/workflows/backupfiles.yml
@@ -7,7 +7,7 @@ jobs:
     name: Grab files backup and clean it out a bit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - uses: ./.github/actions/dingorunner
         env:
@@ -18,7 +18,7 @@ jobs:
           env: live
 
       - name: 'Upload Backup Artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: amp-file-backup
           path: files_live

diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -17,7 +17,7 @@ permissions:
   pull-requests: write
 jobs:
   cci:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'cci') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -29,7 +29,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   asp:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'asp')
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -41,7 +41,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   champ:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'champ') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -53,7 +53,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   coco:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'coco') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -65,7 +65,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   usrse:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'usrse') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   careers:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'careers') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -89,7 +89,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   gpc:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'gpc') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -101,7 +101,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   ky:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'ky') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -113,7 +113,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   nect:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'nect') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}
@@ -125,7 +125,7 @@ jobs:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       REPO: "${{ github.server_url }}/${{ github.repository }}"
   wip:
-    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v2
+    uses: necyberteam/reusable_actions/.github/workflows/behat.yml@v3
     if: contains(github.event.inputs.sites, 'wip')
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}

diff --git a/.github/workflows/configsync.yml b/.github/workflows/configsync.yml
@@ -11,7 +11,7 @@ jobs:
     name: Grab live db and add un-synced files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - uses: ./.github/actions/dingorunner
         env:

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -20,7 +20,7 @@ permissions:
 jobs:
   asp:
     name: Run cypress tests in 'accessmatch' directory
-    uses: necyberteam/reusable_actions/.github/workflows/cypress.yml@main
+    uses: necyberteam/reusable_actions/.github/workflows/cypress.yml@v3
     if: contains(github.event.inputs.sites, 'asp') || github.event_name == 'pull_request'
     secrets:
       slack_token: ${{ secrets.SLACK_TOKEN }}

diff --git a/.github/workflows/deployprod.yml b/.github/workflows/deployprod.yml
@@ -8,7 +8,7 @@ jobs:
     name: Tag code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.head_commit.message, '#nobuild') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - uses: ./.github/actions/dingorunner
         env:
@@ -34,7 +34,7 @@ jobs:
     if: ${{ contains(github.ref, 'md-') }}
     needs: deploy
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - name: Composer install
         run: |

diff --git a/.github/workflows/prdelete.yml b/.github/workflows/prdelete.yml
@@ -7,7 +7,7 @@ jobs:
     name: Delete Multidev site on PR close
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - name: Set env GITHUB_REF_MD
         run: echo "GITHUB_REF_MD=$(echo ${{ github.head_ref }} | cut -c 1-3)" >> $GITHUB_ENV

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -13,7 +13,7 @@ jobs:
     name: Tag code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/updates.yml b/.github/workflows/updates.yml
@@ -16,7 +16,7 @@ jobs:
     name: Run updates
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - uses: ./.github/actions/dingorunner
         env:

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,7 +1,7 @@
 {
   "patches": {
     "drupal/core": {
-      "More link is missing in pager...": "https://www.drupal.org/files/issues/2023-08-25/3381979-8.patch"
+      "More link is missing in pager...": "https://www.drupal.org/files/issues/2023-10-09/3381979-13.patch"
     },
     "drupal/mgv": {
       "current domain name": "patches/currentdomainname.patch"

diff --git a/tests/behat/features/templates/tags/tags-auth.feature b/tests/behat/features/templates/tags/tags-auth.feature
@@ -10,11 +10,10 @@ Feature: This test is as an authenticated user.
     Given I am logged in as a user with the "authenticated" role
     When I go to "tags"
     Then I should see "Tags"
-    And I should see "Contains any word"
     And I should see "Search"
     And I should see "login"
     And I should see "osg"
-    And I should see "ACCESS RPs"
+    And I should see "ACCESS Resources"
     And I should see "xsede"
 
   Scenario: Tags pages shows "Request Tag" for authenticated user

diff --git a/tests/behat/features/templates/tags/tags-request-auth.feature b/tests/behat/features/templates/tags/tags-request-auth.feature
@@ -15,7 +15,7 @@ An email is sent to the NECT mailing list upon submission.
     And I should see "Tag Request Name"
     And I should see "Suggested Parent Tag"
     When I fill in "Tag Request Name" with "TEST"
-    # this specifies ACCESS RPs as the parent
+    # this specifies ACCESS Resources as the parent
     When I select "684" from "Suggested Parent Tag"
     And I wait 2 seconds
     When I press "Submit"

diff --git a/tests/behat/features/templates/tags/tags-unauth.feature b/tests/behat/features/templates/tags/tags-unauth.feature
@@ -9,11 +9,10 @@ Feature: Tests for the Tags page with unauthenticated user.  Verify "Request Tag
       Given I am not logged in
       When I go to "tags"
       Then I should see "Tags"
-      And I should see "Contains any word"
       And I should see "Search"
       And I should see "login"
       And I should see "osg"
-      And I should see "ACCESS RPs"
+      And I should see "ACCESS Resources"
       And I should see "xsede"
 
     Scenario: Tags pages does not show "Request Tag" when logged out

diff --git a/tests/cypress/cypress/e2e/accessmatch/events/events-add.cy.js b/tests/cypress/cypress/e2e/accessmatch/events/events-add.cy.js
@@ -17,13 +17,13 @@ describe("Authenticated user tests the Events Form without Affinity Group", () =
     cy.loginAs("[email protected]", "b8QW]X9h7#5n");
     cy.visit("/events/add");
 
-    //Page Title
+    // Page Title
     cy.get("#block-claro-page-title").contains("Create ACCESS Event");
 
-    //User filling out form title
+    // User filling out form title
     cy.get("#edit-title-0-value").type("example-event");
 
-    //Date and Time of Event
+    // Date and Time of Event
     cy.get("#edit-recur-type-custom").click();
     cy.get("#custom-date-values > thead > tr > .field-label").contains(
       "Custom Date(s) and Time(s)"
@@ -33,19 +33,19 @@ describe("Authenticated user tests the Events Form without Affinity Group", () =
     cy.get("#edit-custom-date-0-value-time").type("04:30:00");
     cy.get("#edit-custom-date-0-end-value-time").type("04:30:00");
 
-    //Event Location
+    // Event Location
     cy.get("#edit-field-location-0-value").type("Zoom");
 
-    //Event Contact
+    // Event Contact
     cy.get("#edit-field-contact-0-value").type("Pecan Pie");
 
-    //Registration Link
+    // Registration Link
     cy.get("#edit-field-registration-0-uri").type(
       "https://test-accessmatch.pantheonsite.io/"
     );
 
-    //Event Tag
-    cy.get("#edit-field-tags-0-target-id").type("login (682)");
+    // Event Tag
+    cy.get("details.tags summary").click().get("#tag-login").click();
 
     //Save As Selection
     cy.get("#edit-moderation-state-0-state").select("Published");