Add a test for going from a regular POST into a subflow

codeforamerica · Nov 1, 2023 · 63ad9b6 · 63ad9b6
1 parent cfc3297
commit 63ad9b6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/test/java/formflow/library/controllers/ScreenControllerTest.java b/src/test/java/formflow/library/controllers/ScreenControllerTest.java
@@ -11,6 +11,7 @@
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import formflow.library.address_validation.AddressValidationService;
@@ -21,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -180,9 +182,6 @@ public void shouldSetIterationIsCompleteWhenLastScreenInSubflowIsAPost() throws
       assertThat((Boolean) iterationAfterSecondSubflowScreeen.get("iterationIsComplete")).isTrue();
     }
 
-    private record Result(UUID testSubflowLogicUUID, List<Map<String, Object>> iterationsAfterFirstPost, String uuidString) {
-    }
-
     @Test
     public void shouldHandleSubflowsWithAGetAndThenAPost() throws Exception {
       setFlowInfoInSession(session, "yetAnotherTestFlow", submission.getId());
@@ -208,6 +207,30 @@ public void shouldHandleSubflowsWithAGetAndThenAPost() throws Exception {
       List<Map<String, Object>> iterationsAfterSecondPost = (List<Map<String, Object>>) submissionAfterSecondPost.getInputData().get("subflowWithAGetAndThenAPost");
       assertThat((Boolean) iterationsAfterSecondPost.get(0).get("iterationIsComplete")).isTrue();
     }
+
+    @Test
+    public void shouldHandleGoingFromANonSubflowPostScreenIntoASubflow() throws Exception {
+      setFlowInfoInSession(session, "testSubflowLogic", submission.getId());
+
+      ResultActions result = mockMvc.perform(post("/flow/testSubflowLogic/testEntryScreen")
+          .session(session)
+          .params(new LinkedMultiValueMap<>(Map.of(
+              "doYouWantToEnterTheTestSubflow", List.of("true"))))
+      );
+      String nextScreenUrl = "/flow/testSubflowLogic/testEntryScreen/navigation";
+      result.andExpect(redirectedUrl(nextScreenUrl));
+
+      while (Objects.requireNonNull(nextScreenUrl).contains("/navigation")) {
+        // follow redirects
+        nextScreenUrl = mockMvc.perform(get(nextScreenUrl).session(session))
+            .andExpect(status().is3xxRedirection()).andReturn()
+            .getResponse()
+            .getRedirectedUrl();
+      }
+      assertThat(nextScreenUrl).isEqualTo("/flow/testSubflowLogic/subflowAddItem");
+      FormScreen nextScreen = new FormScreen(mockMvc.perform(get(nextScreenUrl)));
+      assertThat(nextScreen.getTitle()).isEqualTo("Subflow Page");
+    }
   }
 
   @Nested

diff --git a/src/test/java/formflow/library/utilities/AbstractMockMvcTest.java b/src/test/java/formflow/library/utilities/AbstractMockMvcTest.java
@@ -142,7 +142,8 @@ protected ResultActions postExpectingSuccess(String pageName, Map<String, List<S
   // Appends the id to the post URL
   protected ResultActions postToUrlExpectingSuccess(String postUrl, String redirectUrl,
       Map<String, List<String>> params, String uuid) throws Exception {
-    return postToUrlExpectingSuccess(postUrl + "/" + uuid, redirectUrl, params);
+    String uuidString = uuid == null ? "" : '/' + uuid;
+    return postToUrlExpectingSuccess(postUrl + uuidString, redirectUrl, params);
   }
 
   protected ResultActions postToUrlExpectingSuccess(String postUrl, String redirectUrl,

diff --git a/src/test/resources/templates/testSubflowLogic/subflowAddItem.html b/src/test/resources/templates/testSubflowLogic/subflowAddItem.html
@@ -9,8 +9,8 @@
       <main id="content" role="main" class="form-card spacing-above-35">
         <th:block
             th:replace="~{fragments/cardHeader :: cardHeader(header='Subflow Page', subtext='This is a page within a subflow')}"/>
-        <!-- Test that the currentSubflowItem is passed in by the controller: -->
-        <div th:text="${currentSubflowItem.firstNameSubflow}"></div>
+<!--         Test that the currentSubflowItem is passed in by the controller: -->
+        <div th:text="${currentSubflowItem}"></div>
         <div>
           <th:block
               th:replace="~{fragments/inputs/text ::