PIL-2819: Resolved accessibility issue for RegistrationInProgress and… (#636)

Author: kevincoatsworth

app/controllers/RegistrationInProgressController.scala

@@ -25,15 +25,15 @@ import play.api.mvc.*
 import play.twirl.api.Html
 import services.SubscriptionService
 import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController
-import views.html.RegistrationInProgressNewView
+import views.html.RegistrationInProgressView
 
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext
 
 class RegistrationInProgressController @Inject() (
   val controllerComponents: MessagesControllerComponents,
   identify:                 IdentifierAction,
-  viewHomepage:             RegistrationInProgressNewView,
+  viewHomepage:             RegistrationInProgressView,
   subscriptionService:      SubscriptionService
 )(using appConfig: FrontendAppConfig, ec: ExecutionContext)
     extends FrontendBaseController

…RegistrationInProgressNewView.scala.html …ws/RegistrationInProgressView.scala.htmlapp/views/RegistrationInProgressNewView.scala.html renamed to app/views/RegistrationInProgressView.scala.html app/views/RegistrationInProgressNewView.scala.html renamed to app/views/RegistrationInProgressView.scala.html

@@ -35,7 +35,7 @@ <h1 class="govuk-heading-l">@messages("homepage.title")</h1>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      @heading(messages("registrationInProgress.banner.heading"), "govuk-heading-s")
+      @heading(messages("registrationInProgress.banner.heading"), "govuk-heading-s", "h2")
       @paragraphBody(messages("registrationInProgress.banner.message"))
     </div>
   </div>

…/RegistrationInProgressNewViewSpec.scala …ews/RegistrationInProgressViewSpec.scalatest/views/RegistrationInProgressNewViewSpec.scala renamed to test/views/RegistrationInProgressViewSpec.scala test/views/RegistrationInProgressNewViewSpec.scala renamed to test/views/RegistrationInProgressViewSpec.scala

@@ -21,17 +21,18 @@ import controllers.routes
 import org.jsoup.Jsoup
 import org.jsoup.nodes.{Document, Element}
 import org.jsoup.select.Elements
-import views.html.RegistrationInProgressNewView
+import views.behaviours.ViewScenario
+import views.html.RegistrationInProgressView
 
-class RegistrationInProgressNewViewSpec extends ViewSpecBase {
-  lazy val page:   RegistrationInProgressNewView = inject[RegistrationInProgressNewView]
-  lazy val plrRef: String                        = "XMPLR0012345678"
+class RegistrationInProgressViewSpec extends ViewSpecBase {
+  lazy val page:   RegistrationInProgressView = inject[RegistrationInProgressView]
+  lazy val plrRef: String                     = "XMPLR0012345678"
 
   lazy val view: Document = Jsoup.parse(
     page(plrRef)(request, appConfig, messages).toString()
   )
 
-  "RegistrationInProgressNewView" should {
+  "RegistrationInProgressView" should {
     "have a title" in {
       view.title() mustBe "Report Pillar 2 Top-up Taxes - GOV.UK"
     }
@@ -76,12 +77,12 @@ class RegistrationInProgressNewViewSpec extends ViewSpecBase {
       val twoThirdsColumn: Elements = view.getElementsByClass("govuk-grid-column-two-thirds")
       twoThirdsColumn.size() mustBe 1
     }
-//    TODO: Uncomment accessibility behaviours when second H1 is corrected
-//    val viewScenarios: Seq[ViewScenario] =
-//      Seq(
-//        ViewScenario("view", view)
-//      )
-//
-//    behaveLikeAccessiblePage(viewScenarios)
+
+    val viewScenarios: Seq[ViewScenario] =
+      Seq(
+        ViewScenario("view", view)
+      )
+
+    behaveLikeAccessiblePage(viewScenarios, false)
   }
 }