From bd7683af8adad5e6471e82b5658a39ea4c8d34c2 Mon Sep 17 00:00:00 2001
From: Nehemiah Abuga <121119072+nehemiah-abuga@users.noreply.github.com>
Date: Mon, 16 Sep 2024 07:00:08 -0700
Subject: [PATCH 1/3] PXBF-1703-clean-cy-script-commands: clean up cy script
 commands

---
 benefit-finder/package.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/benefit-finder/package.json b/benefit-finder/package.json
index fedd62b92..734c00323 100644
--- a/benefit-finder/package.json
+++ b/benefit-finder/package.json
@@ -28,14 +28,9 @@
     "cy:dev:storybook": "NODE_ENV=test npm run cy:prebuild:storybook && storybook dev -p 6006",
     "cy:build:storybook": "NODE_ENV=test npm run cy:prebuild:storybook && storybook build --test",
     "cy:run:e2e": "NODE_ENV=test npx cypress run --browser chrome",
-    "cy:run": "NODE_ENV=test npm run cy:run:e2e",
     "cy:run:prod:e2e": "NODE_ENV=test npx cypress run --config-file cypress.prod.links.config.js --browser chrome",
     "cy:run:prod:links:e2e": "NODE_ENV=test npx cypress run --config-file cypress.prod.links.config.js --browser chrome",
-    "cy:run:pipeline": "NODE_ENV=test concurrently -k -s first -n \"SB,TEST\" -c \"magenta,blue\"   \"http-server ./storybook-static --port 6006 --silent\" -Y",
-    "cy:run:edge:e2e": "NODE_ENV=test npx cypress run --browser edge",
-    "cy:run:firefox:e2e": "NODE_ENV=test npx cypress run --browser firefox",
-    "cy:run:webkit-safari:e2e": "NODE_ENV=test npx cypress run --browser webkit",
-    "cy:run:cross-browser:e2e": "NODE_ENV=test npm run cy:run:e2e && npm run cy:run:edge:e2e && npm run cy:run:firefox:e2e && cy:run:webkit-safari:e2e"
+    "cy:run:pipeline": "NODE_ENV=test concurrently -k -s first -n \"SB,TEST\" -c \"magenta,blue\"   \"http-server ./storybook-static --port 6006 --silent\" -Y"
   },
   "dependencies": {
     "@uswds/uswds": "^3.8.2",

From 9845ed060257624c5716304ccd5030ceb5ada5be Mon Sep 17 00:00:00 2001
From: gchi25 <Yuechen.Chi@gsa.gov>
Date: Wed, 18 Sep 2024 14:14:21 -0400
Subject: [PATCH 2/3] PXBF-1817-display-raw-html: display raw html

---
 .../src/Controller/LifeEventController.php                       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php
index 9d1512661..637c03c84 100644
--- a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php
+++ b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php
@@ -320,6 +320,7 @@ public function getData($id) {
       "benefits" => $benefits,
     ];
     $json = json_encode($result, JSON_PRETTY_PRINT);
+    $json = htmlspecialchars($json);
 
     if ($this->displayData) {
       print_r("<p>JSON Data<pre>");

From 58de5f3dab532a406c180efa7db1aad35ead2c51 Mon Sep 17 00:00:00 2001
From: Xavier Metichecchia <XavierMetichecchia>
Date: Wed, 2 Oct 2024 11:50:35 -0400
Subject: [PATCH 3/3] PXBF-xavier-add-drush-cr: Add extra drush cr before drush
 maint mode command

---
 scripts/drush-post-deploy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/drush-post-deploy.sh b/scripts/drush-post-deploy.sh
index 3e1c41892..bd95d7a3a 100755
--- a/scripts/drush-post-deploy.sh
+++ b/scripts/drush-post-deploy.sh
@@ -4,6 +4,7 @@
 ## It reads lines based on new lines.
 
 echo  "Updating drupal ... "
+drush cr
 drush state:set system.maintenance_mode 1 -y
 drush cr
 drush updatedb --no-cache-clear -y