Merge branch 'main' into VACMS-16853-next-build-branches-ftw

department-of-veterans-affairs · Feb 9, 2024 · 2870a0e · 2870a0e
2 parents 50e09ef + 917d9e3
commit 2870a0e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/.github/workflows/actions-metrics.yml b/.github/workflows/actions-metrics.yml
@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Send GitHub Actions metrics to DataDog
-        uses: int128/datadog-actions-metrics@56be1c4bf92adece9d10f7fef4ba48bccf8e8c81 # v1.77.0
+        uses: int128/datadog-actions-metrics@af1a1a70bb380b079e38053d5fb32ae907ce2b6a # v1.79.0
         with:
           datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
           collect-job-metrics: true

diff --git a/composer.lock b/composer.lock
@@ -6519,17 +6519,17 @@
         },
         {
             "name": "drupal/geocoder",
-            "version": "4.22.0",
+            "version": "4.23.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geocoder.git",
-                "reference": "8.x-4.22"
+                "reference": "8.x-4.23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.22.zip",
-                "reference": "8.x-4.22",
-                "shasum": "cc6d9bbb542c5073e4a19dececa58ffdac146aa4"
+                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.23.zip",
+                "reference": "8.x-4.23",
+                "shasum": "111a67f6da761848882482041a7c67c797e96a3e"
             },
             "require": {
                 "davedevelopment/stiphle": "^0.9.2",
@@ -6573,8 +6573,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-4.22",
-                    "datestamp": "1706827890",
+                    "version": "8.x-4.23",
+                    "datestamp": "1707161636",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

diff --git a/tests/cypress/integration/features/content_type/facilities/vba/vba_facility.feature b/tests/cypress/integration/features/content_type/facilities/vba/vba_facility.feature
@@ -13,6 +13,37 @@ Feature: CMS User may effectively interact with the VBA Facility form
     Then the primary tab "View" should exist
     Then the primary tab "Edit" should not exist
 
+  Scenario: Test restricted_archive workflow prevents archiving a VBA Facility as a VBA editor.
+    When I am logged in as a user with the roles "content_creator_vba, content_publisher"
+    And my workbench access sections are set to "1065"
+    When I am at "/node/4063/edit"
+    And I scroll to element "select#edit-moderation-state-0-state"
+    Then an option with the text "Archived" from dropdown with selector "select#edit-moderation-state-0-state" should not be visible
+    And I scroll to position "bottom"
+    And I click the "Unlock" link
+    And I click the "Confirm break lock" button
+
+  Scenario: Test restricted_archive workflow allows archiving a VBA Facility as a content_admin.
+    Given I am logged in as a user with the "content_admin" role
+    # Columbia VA Regional Benefit Office
+    When I am at "/node/4063/edit"
+    And I scroll to element "select#edit-moderation-state-0-state"
+    Then an option with the text "Archived" from dropdown with selector "select#edit-moderation-state-0-state" should be visible
+
+    When I select option "Archived" from dropdown with selector "select#edit-moderation-state-0-state"
+    And I fill in field with selector "#edit-revision-log-0-value" with value "[Test Data] Revision log message."
+    And I save the node
+    Then I should see "has been updated."
+
+    When I click the edit tab
+    And I scroll to element "select#edit-moderation-state-0-state"
+    Then an option with the text "Published" from dropdown with selector "select#edit-moderation-state-0-state" should be visible
+
+    When I select option "Published" from dropdown with selector "select#edit-moderation-state-0-state"
+    And I fill in field with selector "#edit-revision-log-0-value" with value "[Test Data] Revision log message."
+    And I save the node
+    Then I should see "has been updated."
+
   Scenario: Enable banner segment and ensure expected fields are present
     Given I am logged in as a user with the "content_admin" role
     And my workbench access sections are set to "1065"