Merge branch 'main' into VACMS-15781-Increase-Dependabot-limit

department-of-veterans-affairs · Oct 24, 2023 · 4b6b06e · 4b6b06e
2 parents 31bc1ad + d04a7dd
commit 4b6b06e
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ The VA.gov CMS Team
       1. [BRD Environments](READMES/brd.md)
       1. [HTTPS](READMES/https.md)
       1. [Environment Variables](READMES/environment-variables.md)
-      1. [Kubernetes](READMES/kubernetes.md)
+      1. [Kubernetes](READMES/historical/kubernetes.md)
    1. [Alerts](READMES/alerts.md)
    1. [GitHub Workflows](READMES/github-workflows.md)
    1. [Logging into BRD (e.g. production, staging) instances](READMES/brd-login.md)

diff --git a/composer.json b/composer.json
@@ -207,7 +207,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^4.0",
         "symfony/routing": "^4.0",
-        "va-gov/content-build": "^0.0.3369",
+        "va-gov/content-build": "^0.0.3372",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "894f4b5da47c94fd3b7be8d4f4b51a9d",
+    "content-hash": "2029832df0507f936056503739c48520",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -26892,16 +26892,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3369",
+            "version": "v0.0.3372",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "249c6e57df98911b8d2a9f47df0fede6be4f539c"
+                "reference": "b2c66f1be86b262b28b6c086c217e6a308b3bfd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/249c6e57df98911b8d2a9f47df0fede6be4f539c",
-                "reference": "249c6e57df98911b8d2a9f47df0fede6be4f539c",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/b2c66f1be86b262b28b6c086c217e6a308b3bfd7",
+                "reference": "b2c66f1be86b262b28b6c086c217e6a308b3bfd7",
                 "shasum": ""
             },
             "type": "node-project",
@@ -26928,9 +26928,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3369"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3372"
             },
-            "time": "2023-10-19T17:22:32+00:00"
+            "time": "2023-10-23T14:31:55+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/docroot/design-system/package-lock.json b/docroot/design-system/package-lock.json
diff --git a/tests/cypress/integration/features/content_type/full_width_banner_alert.feature b/tests/cypress/integration/features/content_type/full_width_banner_alert.feature
@@ -20,12 +20,13 @@ Scenario: Log in and create VAMC Full Width Banner Alert
   And I save the node
   Then the primary tab "Edit" should exist
   And the primary tab "Revisions" should exist
-  Given I click the edit tab
-  And I fill in field with selector "#edit-revision-log-0-value" with value "[Test Data] Revision log message unpublish."
-  And I uncheck the "Published" checkbox within "#edit-status-wrapper"
-  And I save the node
-  Then the primary tab "Edit" should not exist
-  And the primary tab "Revisions" should exist
-  And I should see "it can no longer be edited."
-  Given I reload the page
-  Then I should see "it can no longer be edited."
+# -- The test fails from this point forward if there is an existing VA Boston banner.
+#  Given I click the edit tab
+#  And I fill in field with selector "#edit-revision-log-0-value" with value "[Test Data] Revision log message unpublish."
+#  And I uncheck the "Published" checkbox within "#edit-status-wrapper"
+#  And I save the node
+#  Then the primary tab "Edit" should not exist
+#  And the primary tab "Revisions" should exist
+#  And I should see "it can no longer be edited."
+#  Given I reload the page
+#  Then I should see "it can no longer be edited."