[CCAP-406] Update Intro Section Numbers (#796)

src/main/resources/messages.properties

@@ -249,7 +249,7 @@ onboarding-language-pref.language-to-speak-label=What language do you prefer to
 onboarding-language-pref.language-to-speak-help-text=We will do our best to connect you with someone who speaks your language for any in-person or phone interactions.
 #
 parent-info-intro.title=Parent and Guardian Information
-parent-info-intro.step=Step 1 of 5
+parent-info-intro.step=Step 1 of {0}
 parent-info-intro.box.header=We'll ask about
 parent-info-intro.box.one=Basic info about guardians
 parent-info-intro.box.two=Other adult dependents
@@ -373,7 +373,7 @@ parent-intro-family-info.header=We've collected all the guardian information.
 parent-intro-family-info.continue=Continue to next section
 #
 children-info-intro.title=Your Children
-children-info-intro.step=Step 2 of 5
+children-info-intro.step=Step 2 of {0}
 children-info-intro.box.header=We'll ask about
 children-info-intro.box.one=Children's basic info
 children-info-intro.box.two=Which children need care
@@ -444,7 +444,7 @@ children-ccap-max-number.subtext=We will let your CCR&R know that you have anoth
 
 #activities-parent-intro
 activities-parent-intro.title=Activities Parent Intro
-activities-parent-intro.step=Step 3 of 5
+activities-parent-intro.step=Step 3 of {0}
 activities-parent-intro.header=Parent or Guardian Schedules and Income
 activities-parent-intro.box.header=We'll ask about
 activities-parent-intro.box.one=Your schedule
@@ -654,7 +654,7 @@ activities-partner-ed-program-dates.header=How long will {0} be enrolled in this
 #
 #unearned-income-intro
 unearned-income-intro.title=Unearned Income Intro
-unearned-income-intro.step=Step 4 of 5
+unearned-income-intro.step=Step 4 of {0}
 unearned-income-intro.header=Other Income and Programs
 unearned-income-intro.box.header=We'll ask about
 unearned-income-intro.box.one=Family income
@@ -706,7 +706,7 @@ unearned-income-referral-services.housing-support=Housing support and homelessne
 unearned-income-referral-services.disability-support=Services for people living with a physical or mental disability
 
 #
-submit-intro.step=Step 5 of 5
+submit-intro.step=Step 5 of {0}
 submit-intro.title=Sign and Submit
 submit-intro.box.header=We'll ask about
 submit-intro.box.one=Verification documents

src/main/resources/templates/gcc/activities-parent-intro.html

@@ -10,7 +10,7 @@
       <main id="content" role="main" class="form-card spacing-above-35">
         <div class="text--centered">
           <th:block th:replace="~{fragments/gcc-icons :: income}"></th:block>
-          <p class="text--grey-dark" th:text="#{activities-parent-intro.step}"></p>
+          <p class="text--grey-dark" th:id="activities-parent-intro-step" th:text="${#messages.msg('activities-parent-intro.step', (@environment.getProperty('il-gcc.dts.expand-existing-provider-flow') == 'true' ? '6' : '5'))}"></p>
           <th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{activities-parent-intro.header})}"/>
         </div>
         <div class="form-card__content">

src/main/resources/templates/gcc/children-info-intro.html

@@ -10,7 +10,7 @@
       <main id="content" role="main" class="form-card spacing-above-35">
         <div class="text--centered">
           <th:block th:replace="~{fragments/gcc-icons :: householdFamily}"></th:block>
-          <p class="text--grey-dark" th:text="#{children-info-intro.step}"></p>
+          <p class="text--grey-dark" th:id="children-info-intro-step" th:text="${#messages.msg('children-info-intro.step', (@environment.getProperty('il-gcc.dts.expand-existing-provider-flow') == 'true' ? '6' : '5'))}"></p>
           <th:block
               th:replace="~{fragments/cardHeader :: cardHeader(header=#{children-info-intro.title})}"/>
         </div>

src/main/resources/templates/gcc/parent-info-intro.html

@@ -10,7 +10,7 @@
       <main id="content" role="main" class="form-card spacing-above-35">
         <div class="text--centered">
           <th:block th:replace="~{fragments/gcc-icons :: person}"></th:block>
-          <p class="text--grey-dark" th:text="#{parent-info-intro.step}"></p>
+          <p class="text--grey-dark" th:id="parent-info-intro-step" th:text="${#messages.msg('parent-info-intro.step', (@environment.getProperty('il-gcc.dts.expand-existing-provider-flow') == 'true' ? '6' : '5'))}"></p>
           <th:block
               th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-info-intro.title})}"/>
         </div>

src/main/resources/templates/gcc/submit-intro.html

@@ -10,7 +10,7 @@
             <main id="content" role="main" class="form-card spacing-above-35">
                 <div class="text--centered">
                     <th:block th:replace="~{fragments/gcc-icons :: clipboardWithEnvelope}"></th:block>
-                    <p class="text--grey-dark" th:text="#{submit-intro.step}"></p>
+                    <p class="text--grey-dark" th:id="submit-intro-step" th:text="${#messages.msg('submit-intro.step', (@environment.getProperty('il-gcc.dts.expand-existing-provider-flow') == 'true' ? '6' : '5'))}"></p>
                     <th:block
                             th:replace="~{fragments/cardHeader :: cardHeader(header=#{submit-intro.title})}"/>
                 </div>

src/main/resources/templates/gcc/unearned-income-intro.html

@@ -10,7 +10,7 @@
       <main id="content" role="main" class="form-card spacing-above-35">
         <div class="text--centered">
           <th:block th:replace="~{fragments/gcc-icons :: incomeFamily}"></th:block>
-          <p class="text--grey-dark" th:text="#{unearned-income-intro.step}"></p>
+          <p class="text--grey-dark" th:id="unearned-income-intro-step" th:text="${#messages.msg('unearned-income-intro.step', (@environment.getProperty('il-gcc.dts.expand-existing-provider-flow') == 'true' ? '6' : '5'))}"></p>
           <th:block
                   th:replace="~{fragments/cardHeader :: cardHeader(header=#{unearned-income-intro.header})}"/>
         </div>

src/test/java/org/ilgcc/app/journeys/GccFlowJourneyTest.java

@@ -50,6 +50,7 @@ void fullGccFlow() throws IOException {
 
         // parent-info-intro
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("parent-info-intro.title"));
+        assertThat(testPage.findElementTextById("parent-info-intro-step")).isEqualTo("Step 1 of 5");
         testPage.clickContinue();
         // parent-info-basic-1
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("parent-info-basic-1.title"));
@@ -174,6 +175,7 @@ void fullGccFlow() throws IOException {
         testPage.clickButton(getEnMessage("parent-intro-family-info.continue"));
         //children-info-intro
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("children-info-intro.title"));
+        assertThat(testPage.findElementTextById("children-info-intro-step")).isEqualTo("Step 2 of 5");
         testPage.clickContinue();
         // children-add
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("children-add.title"));
@@ -269,6 +271,7 @@ void fullGccFlow() throws IOException {
 
         //activities-parent-intro
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("activities-parent-intro.title"));
+        assertThat(testPage.findElementTextById("activities-parent-intro-step")).isEqualTo("Step 3 of 5");
         testPage.clickContinue();
         //activities-parent-type
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("activities-parent-type.title"));
@@ -588,6 +591,7 @@ void fullGccFlow() throws IOException {
 
         //unearned-income-intro
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("unearned-income-intro.title"));
+        assertThat(testPage.findElementTextById("unearned-income-intro-step")).isEqualTo("Step 4 of 5");
         testPage.clickContinue();
 
         //unearned-income-source
@@ -624,6 +628,7 @@ void fullGccFlow() throws IOException {
 
         // submit-intro
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("submit-intro.title"));
+        assertThat(testPage.findElementTextById("submit-intro-step")).isEqualTo("Step 5 of 5");
         testPage.clickContinue();
 
         // submit-ccap-terms