From bc5d358f8dcc26713512b6e8145427ce22a05b60 Mon Sep 17 00:00:00 2001
From: Robert Hasselle <robert.hasselle@oddball.io>
Date: Thu, 3 Oct 2024 16:42:29 -0500
Subject: [PATCH] convenience changes and test fix

---
 .../simple-forms/21-10210/config/form.js        |  1 +
 .../21-10210/containers/IntroductionPage.jsx    |  3 +++
 .../10210-lay-witness-statement.cypress.spec.js |  6 ++++--
 .../21-10210/tests/e2e/fixtures/mocks/user.json | 17 ++---------------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/applications/simple-forms/21-10210/config/form.js b/src/applications/simple-forms/21-10210/config/form.js
index cf942b168678..30c914318208 100644
--- a/src/applications/simple-forms/21-10210/config/form.js
+++ b/src/applications/simple-forms/21-10210/config/form.js
@@ -59,6 +59,7 @@ const formConfig = {
   trackingPrefix: 'lay-witness-10210-',
   dev: {
     showNavLinks: true,
+    collapsibleNavLinks: true,
   },
   hideUnauthedStartLink: true,
   introduction: IntroductionPage,
diff --git a/src/applications/simple-forms/21-10210/containers/IntroductionPage.jsx b/src/applications/simple-forms/21-10210/containers/IntroductionPage.jsx
index 72f229a417aa..ac5bc70ebde9 100644
--- a/src/applications/simple-forms/21-10210/containers/IntroductionPage.jsx
+++ b/src/applications/simple-forms/21-10210/containers/IntroductionPage.jsx
@@ -65,6 +65,9 @@ export const IntroductionPage = ({ route }) => {
       content={content}
       ombInfo={ombInfo}
       childContent={childContent}
+      devOnly={{
+        forceShowFormControls: true,
+      }}
     />
   );
 };
diff --git a/src/applications/simple-forms/21-10210/tests/e2e/10210-lay-witness-statement.cypress.spec.js b/src/applications/simple-forms/21-10210/tests/e2e/10210-lay-witness-statement.cypress.spec.js
index 1ba388630277..a1247e388f66 100644
--- a/src/applications/simple-forms/21-10210/tests/e2e/10210-lay-witness-statement.cypress.spec.js
+++ b/src/applications/simple-forms/21-10210/tests/e2e/10210-lay-witness-statement.cypress.spec.js
@@ -8,6 +8,7 @@ import manifest from '../../manifest.json';
 import featureToggles from '../../../shared/tests/e2e/fixtures/mocks/feature-toggles.json';
 import { getSignerFullName } from './helpers';
 import mockSubmit from '../../../shared/tests/e2e/fixtures/mocks/application-submit.json';
+import user from './fixtures/mocks/user.json';
 import {
   getPagePaths,
   fillAddressWebComponentPattern,
@@ -26,8 +27,7 @@ const testConfig = createTestConfig(
     pageHooks: {
       introduction: ({ afterHook }) => {
         afterHook(() => {
-          cy.get('va-button[text*="start"]');
-          cy.findByText(/without signing in/i).click({ force: true });
+          cy.get('a.vads-c-action-link--green').click();
         });
       },
       'witness-personal-information-a': ({ afterHook }) => {
@@ -118,6 +118,8 @@ const testConfig = createTestConfig(
 
     setupPerTest: () => {
       cy.intercept('GET', '/v0/feature_toggles?*', featureToggles);
+      cy.intercept('/v0/user', user);
+      cy.login(user);
       cy.intercept('POST', formConfig.submitUrl, mockSubmit);
     },
   },
diff --git a/src/applications/simple-forms/21-10210/tests/e2e/fixtures/mocks/user.json b/src/applications/simple-forms/21-10210/tests/e2e/fixtures/mocks/user.json
index f85520cd875b..c95646750616 100644
--- a/src/applications/simple-forms/21-10210/tests/e2e/fixtures/mocks/user.json
+++ b/src/applications/simple-forms/21-10210/tests/e2e/fixtures/mocks/user.json
@@ -22,23 +22,10 @@
       "in_progress_forms": [
         {
           "form": "21-10210",
-          "metadata": {
-            "savedAt": 1681760746439,
-            "submission": {
-              "status": false,
-              "errorMessage": false,
-              "id": false,
-              "timestamp": 1681760746426,
-              "hasAttemptedSubmit": true
-            },
-            "expiresAt": 1686944746,
-            "lastUpdated": 1681760746,
-            "inProgressFormId": 19439
-          },
-          "lastUpdated": 1681760746
+          "metadata": {}
         }
       ],
-      "prefills_available": [],
+      "prefills_available": ["21-10210"],
       "services": [
         "hca",
         "edu-benefits",