PIL-2771 Update the homepage title and H1 (#630)

PIL-2771: Update the homepage title and H1

Co-authored-by: Kevin Coatsworth <29205960+kevincoatsworth@users.noreply.github.com>

Author: olakunlekuye2

app/views/HomepageView.scala.html

@@ -72,7 +72,7 @@
  </div>
 }
 
-@layout(pageTitle = noTitle, showBackLink = false, twoThirdsPagelayout = false, bannerUrl = Some(routes.HomepageController.onPageLoad().url)) {
+@layout(pageTitle = s"${messages("homepage.title")} - ${messages("service.name")} - ${messages("site.govuk")}", showBackLink = false, twoThirdsPagelayout = false, bannerUrl = Some(routes.HomepageController.onPageLoad().url)) {
 
   @btnBanner match {
     case BtnBanner.Show => {@govukNotificationBanner(NotificationBanner(content = HtmlContent(bannerHtml)))}

app/views/RegistrationInProgressView.scala.html

@@ -25,7 +25,7 @@
 
 @layout(pageTitle = noTitle, showBackLink = false, twoThirdsPagelayout = false, bannerUrl = Some(routes.HomepageController.onPageLoad().url)) {
 
-  <h1 class="govuk-heading-l">@messages("homepage.title")</h1>
+  <h1 class="govuk-heading-l">@messages("registrationInProgress.h1")</h1>
 
   <p class="govuk-body">
    <span><strong>@{messages("homepage.id")}:</strong> @plrReference</span>

conf/messages.en

@@ -845,7 +845,7 @@ subscriptionAddress.change.hidden = the registered contact address
 # Homepage
 #
 ###############################################
-homepage.title = Pillar 2 Top-up Taxes
+homepage.title = Pillar 2 Top-up Taxes homepage
 homepage.group = Group
 homepage.id = ID
 
@@ -1535,6 +1535,7 @@ manageContactDetails.h1 = Submitting your contact details
 manageContactDetails.h2 = Do not press back in your browser or leave this page. It may take up to a minute to process this change.
 
 registrationInProgress.title = Registration in progress
+registrationInProgress.h1 = Pillar 2 Top-up Taxes
 registrationInProgress.banner.heading = Your registration is in progress
 registrationInProgress.banner.message = We are processing your registration. You can check this page in one hour to see your full group account homepage.
 

test/views/HomepageViewSpec.scala

@@ -24,6 +24,7 @@ import models.{BtnBanner, DynamicNotificationAreaState}
 import org.jsoup.Jsoup
 import org.jsoup.nodes.{Document, Element}
 import org.jsoup.select.Elements
+import views.behaviours.ViewScenario
 import views.html.HomepageView
 
 class HomepageViewSpec extends ViewSpecBase {
@@ -32,9 +33,8 @@ class HomepageViewSpec extends ViewSpecBase {
   lazy val plrRef:           String       = "XMPLR0012345678"
   lazy val date:             String       = "1 June 2020"
 
-  // This is only case where the page Title and the H1 heading are inconsistent in the service
-  lazy val pageTitle:   String = "Report Pillar 2 Top-up Taxes - GOV.UK"
-  lazy val pageHeading: String = "Pillar 2 Top-up Taxes"
+  lazy val pageTitle:   String = "Pillar 2 Top-up Taxes homepage - Report Pillar 2 Top-up Taxes - GOV.UK"
+  lazy val pageHeading: String = "Pillar 2 Top-up Taxes homepage"
 
   lazy val organisationView: Document =
     Jsoup.parse(
@@ -510,13 +510,12 @@ class HomepageViewSpec extends ViewSpecBase {
       paidTag.attr("title") mustBe "Paid payments"
     }
 
-//    TODO: Uncomment accessibility behaviours once H1 and title are updated with correct naming convention
-//    val organisationViewScenarios: Seq[ViewScenario] =
-//      Seq(
-//        ViewScenario("organisationView", organisationView)
-//      )
-//
-//    behaveLikeAccessiblePage(organisationViewScenarios)
+    val organisationViewScenarios: Seq[ViewScenario] =
+      Seq(
+        ViewScenario("organisationView", organisationView)
+      )
+
+    behaveLikeAccessiblePage(organisationViewScenarios)
   }
 
   "HomepageView for an agent" should {
@@ -681,13 +680,12 @@ class HomepageViewSpec extends ViewSpecBase {
         controllers.routes.AgentController.onPageLoadClientPillarId.url
     }
 
-//    TODO: Uncomment accessibility behaviours once H1 and title are updated with correct naming convention
-//    val agentViewScenarios: Seq[ViewScenario] =
-//      Seq(
-//        ViewScenario("agentView", agentView)
-//      )
-//
-//    behaveLikeAccessiblePage(agentViewScenarios)
+    val agentViewScenarios: Seq[ViewScenario] =
+      Seq(
+        ViewScenario("agentView", agentView)
+      )
+
+    behaveLikeAccessiblePage(agentViewScenarios)
   }
 
   "HomepageView layout" should {