UML-3318: back & cancel button for "check your answers" screen (#2674)

* back and cancel buttons * add behat tests for cancel and back buttons
ministryofjustice · Jun 25, 2024 · 11cce29 · 11cce29
1 parent 479d754
commit 11cce29
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/service-front/app/features/actor-check-your-answers.feature b/service-front/app/features/actor-check-your-answers.feature
@@ -36,3 +36,16 @@ Feature: Check your answers before requesting an activation key
     When I request to go back and change my postcode
     Then I am taken back to the postcode page where I can see my answers and change them
     Then I press continue and I am taken back to the check answers page
+
+  @ui
+  Scenario: The user can go back and change their entered postcode
+    Given I have requested an activation key with valid details
+    When I request to go back
+    Then I am taken back to the postcode page where I can see my answers and change them
+    Then I press continue and I am taken back to the check answers page
+
+  @ui
+  Scenario: The user can go back and change their entered postcode
+    Given I have requested an activation key with valid details
+    When I press cancel
+    Then I am taken back to the dashboard page
diff --git a/service-front/app/features/context/UI/RequestActivationKeyContext.php b/service-front/app/features/context/UI/RequestActivationKeyContext.php
@@ -1298,6 +1298,23 @@ public function iRequestToGoBackAndChangeMyPostcode()
         $this->ui->clickLink('change-postcode');
     }
 
+    /**
+     * @When /^I request to go back$/
+     */
+    public function iRequestToGoBack()
+    {
+        $this->ui->clickLink('Back');
+    }
+
+    /**
+     * @When /^I press cancel/
+     */
+    public function iPressCancel()
+    {
+        $this->ui->clickLink('Cancel');
+    }
+
+
     /**
      * @When /^I select that I cannot take calls$/
      */

diff --git a/service-front/app/src/Actor/src/Handler/RequestActivationKey/CheckYourAnswersHandler.php b/service-front/app/src/Actor/src/Handler/RequestActivationKey/CheckYourAnswersHandler.php
@@ -109,6 +109,7 @@ public function handleGet(ServerRequestInterface $request): ResponseInterface
                 'user' => $this->user,
                 'form' => $this->form,
                 'data' => $data,
+                'back' => $this->lastPage($this->state($request)),
             ]
         ));
     }

diff --git a/service-front/app/src/Actor/templates/actor/check-your-answers.html.twig b/service-front/app/src/Actor/templates/actor/check-your-answers.html.twig
@@ -5,8 +5,13 @@
 {% block content %}
 
     <div class="govuk-width-container">
-        <main class="govuk-main-wrapper" id="main-content" role="main">
+        <div role="navigation" aria-labelledby="back-link-navigation">
+            <a href="{{ path(back) }}" class="govuk-back-link"  id="back-link-navigation">
+                {% trans %}Back{% endtrans %}
+            </a>
+        </div>
 
+        <main class="govuk-main-wrapper" id="main-content" role="main">
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-two-thirds">
                     <h1 class="govuk-heading-xl">{% trans %}Check your answers{% endtrans %}</h1>
@@ -90,6 +95,10 @@
                             {% trans %}Continue{% endtrans %}
                         </button>
 
+                        <a href="{{ path("lpa.dashboard") }}" class="govuk-button govuk-button--secondary">
+                            {% trans %}Cancel{% endtrans %}
+                        </a>
+
                     {{ govuk_form_close() }}
                 </div>
             </div>