[MG] [OPS-13150] Origins with no OpenBanking payment-failed TryAgain submission fix

Author: michaelgroves90

app/uk/gov/hmrc/cardpaymentfrontend/views/PaymentFailedPage.scala.html

@@ -20,7 +20,7 @@
 @import uk.gov.hmrc.govukfrontend.views.html.components._
 @import uk.gov.hmrc.govukfrontend.views.html.components.implicits.RichFormErrors
 @import payapi.corcommon.model.Origin
-@import payapi.corcommon.model.Origins
+@import payapi.corcommon.model.Origins._
 
 @this(
     errorSummary: GovukErrorSummary,
@@ -32,23 +32,22 @@
 
 @(origin: Origin, hasOpenBanking: Boolean, form: Form[ChooseAPaymentMethodFormValues])(implicit request: RequestHeader, messages: Messages)
 
-@import payapi.corcommon.model.Origins.BcPngr
 @heading= @{messages("payment-failed.heading")}
 
 @layout(pageTitle = Some(heading)) {
 
-    @if(form.hasErrors) {
-        @errorSummary(ErrorSummary(errorList =
-            form.errors.asTextErrorLinks, title = Text(messages("error.there-is-a-problem")))
-        )
-    }
-
     <h1 class="govuk-heading-xl">@{
         messages("payment-failed.heading")
     }</h1>
 
     @if(hasOpenBanking) {
 
+        @if(form.hasErrors) {
+            @errorSummary(ErrorSummary(errorList =
+                form.errors.asTextErrorLinks, title = Text(messages("error.there-is-a-problem")))
+            )
+        }
+
         <p class="govuk-body govuk-!-padding-bottom-6" id="sub-heading">@{
             messages("payment-failed.sub-heading")
         }</p>
@@ -83,17 +82,27 @@ <h1 class="govuk-heading-xl">@{
         }
     } else {
 
-    <p class="govuk-body" id="sub-heading">@{messages("payment-failed.sub-heading")}</p>
+        <p class="govuk-body" id="sub-heading">@{messages("payment-failed.sub-heading")}</p>
+
+        <p class="govuk-body" id="line1">@{messages("payment-failed.failed1")}</p>
+        <ul class="govuk-list--bullet govuk-!-static-padding-left-7">
+            <li class="govuk-body" id="line2">@{messages("payment-failed.failed2")}</li>
+            <li class="govuk-body" id="line3">@{messages("payment-failed.failed3")}</li>
+            @if(origin != BcPngr){ <li class="govuk-body" id="line4">@{messages("payment-failed.failed4")}</li> }
+        </ul>
+        <p class="govuk-body" id="check-again">@{messages("payment-failed.failed-check-again")}</p>
 
-    <p class="govuk-body" id="line1">@{messages("payment-failed.failed1")}</p>
-    <ul class="govuk-list--bullet govuk-!-static-padding-left-7">
-        <li class="govuk-body" id="line2">@{messages("payment-failed.failed2")}</li>
-        <li class="govuk-body" id="line3">@{messages("payment-failed.failed3")}</li>
-        @if(origin != BcPngr){ <li class="govuk-body" id="line4">@{messages("payment-failed.failed4")}</li> }
-    </ul>
-    <p class="govuk-body" id="check-again">@{messages("payment-failed.failed-check-again")}</p>
 
-    @govukButton(Button(content = Text(Messages("payment-failed.failed-check-details")),  id = Some("submit")))
+        @formWithCsrf(
+            action = uk.gov.hmrc.cardpaymentfrontend.controllers.routes.PaymentFailedController.submit
+        ) {
+            @govukButton(Button(
+                content = Text(Messages("payment-failed.failed-check-details")),
+                value = Some(ChooseAPaymentMethodFormValues.TryAgain.entryName),
+                name = Some("payment_method"),
+                attributes = Map("id" -> "next")
+            ))
+        }
 
     <div><br></div>
 

test/uk/gov/hmrc/cardpaymentfrontend/controllers/PaymentFailedControllerSpec.scala

@@ -157,6 +157,54 @@ class PaymentFailedControllerSpec extends ItSpec {
 
     }
 
+    "GET /payment-failed with No Open Banking as a Payment Method" - {
+
+      val fakeGetRequest: FakeRequest[AnyContentAsFormUrlEncoded] = FakeRequest("POST", "/payment-failed").withSessionId().withFormUrlEncodedBody(("payment_method", ChooseAPaymentMethodFormValues.TryAgain.entryName))
+      val fakeGetRequestInWelsh: FakeRequest[AnyContentAsEmpty.type] = FakeRequest("GET", "/payment-failed").withSessionId().withLangWelsh()
+
+      "should return 200 OK" in {
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
+        val result = systemUnderTest.renderPage()(fakeGetRequest)
+        status(result) shouldBe Status.OK
+      }
+
+      "render the page with the correct sub heading in English" in {
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
+        val result = systemUnderTest.renderPage(fakeGetRequest)
+        val document = Jsoup.parse(contentAsString(result))
+        document.selectXpath("//*[@id=\"main-content\"]/div/div/p[1]").text() shouldBe "No payment has been taken from your card."
+      }
+
+      "render the page with the correct sub heading in Welsh" in {
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
+        val result = systemUnderTest.renderPage()(fakeGetRequestInWelsh)
+        val document = Jsoup.parse(contentAsString(result))
+        document.selectXpath("//*[@id=\"main-content\"]/div/div/p[1]").text() shouldBe "Nid oes taliad wedi’i dynnu o’ch cerdyn."
+      }
+
+      "render the page with the correct button content in English" in {
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
+        val result = systemUnderTest.renderPage(fakeGetRequest)
+        val document = Jsoup.parse(contentAsString(result))
+        println(document)
+        document.select(".govuk-button").first().text() shouldBe "Check details and try again"
+      }
+
+      "render the page with the correct button content in Welsh" in {
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
+        val result = systemUnderTest.renderPage(fakeGetRequestInWelsh)
+        val document = Jsoup.parse(contentAsString(result))
+        document.select(".govuk-button").first().text() shouldBe "Gwiriwch y manylion a rhowch gynnig arall arni"
+      }
+
+      "Button should redirect to TryAgain - Enter Email Address page" in {
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
+        val result = systemUnderTest.submit(fakeGetRequest)
+        redirectLocation(result) shouldBe Some("/pay-by-card/email-address")
+      }
+
+    }
+
     "When Open Banking is selected" - {
       val fakeGetRequest: FakeRequest[AnyContentAsFormUrlEncoded] = FakeRequest("POST", "/payment-failed").withSessionId().withFormUrlEncodedBody(("payment_method", ChooseAPaymentMethodFormValues.OpenBanking.entryName))
 
@@ -172,7 +220,7 @@ class PaymentFailedControllerSpec extends ItSpec {
       val fakeGetRequest: FakeRequest[AnyContentAsFormUrlEncoded] = FakeRequest("POST", "/payment-failed").withSessionId().withFormUrlEncodedBody(("payment_method", ChooseAPaymentMethodFormValues.TryAgain.entryName))
 
       "Should redirect to the Enter Email Address page" in {
-        PayApiStub.stubForFindBySessionId2xx(TestJourneys.PfSa.journeyAfterFailWebPayment)
+        PayApiStub.stubForFindBySessionId2xx(TestJourneys.ItSa.journeyAfterFailWebPayment)
         val result = systemUnderTest.submit(fakeGetRequest)
         redirectLocation(result) shouldBe Some("/pay-by-card/email-address")
       }