Merge pull request #224 from hmrc/DL-16142

DL-16142 - remove feature flag

Author: krishnaram88

app/config/ApplicationConfig.scala

@@ -77,5 +77,4 @@ class ApplicationConfig @Inject()(val conf: ServicesConfig,
   lazy val backToInformHMRCNrlUrl: Option[String] = Option(conf.getString("microservice.services.agent-client-mandate-frontend.informHMRCNrlUrl"))
 
   def haveYouRegisteredUrl: String = conf.getString(s"microservice.services.awrs.haveYouRegisteredUrl")
-  def enrolmentJourneyFeature: Boolean = Try(conf.getBoolean("feature.enrolmentJourney")).getOrElse(false)
 }

app/controllers/BusinessVerificationController.scala

@@ -69,7 +69,7 @@ class BusinessVerificationController @Inject()(val config: ApplicationConfig,
         rawBackLink <- currentBackLink
         backLink: Option[String] = rawBackLink.orElse {
           service match {
-            case "awrs" if appConfig.enrolmentJourneyFeature => Some(appConfig.haveYouRegisteredUrl)
+            case "awrs" => Some(appConfig.haveYouRegisteredUrl)
             case _ => rawBackLink
           }
         }

conf/application.conf

@@ -147,5 +147,3 @@ cancelRedirectUrl: "https://www.gov.uk/"
 allowedHosts = [
   "localhost"
 ]
-
-feature.enrolmentJourney = true

project/AppDependencies.scala

@@ -21,15 +21,15 @@ object AppDependencies {
 
   val compile: Seq[ModuleID] = Seq(
     ws,
-    "uk.gov.hmrc"  %% "bootstrap-frontend-play-30"   % "10.0.0",
+    "uk.gov.hmrc"  %% "bootstrap-frontend-play-30"   % "10.1.0",
     "uk.gov.hmrc"  %% "domain-play-30"               % "11.0.0",
     "uk.gov.hmrc"  %% "play-partials-play-30"        % "10.1.0",
     "uk.gov.hmrc"  %% "play-frontend-hmrc-play-30"   % "12.8.0",
     "uk.gov.hmrc"  %% "http-caching-client-play-30"   % "12.2.0",
   )
 
   val test: Seq[ModuleID] = Seq(
-    "uk.gov.hmrc"       %% "bootstrap-test-play-30"  % "10.0.0"    % Test
+    "uk.gov.hmrc"       %% "bootstrap-test-play-30"  % "10.1.0"    % Test
   )
   val itDependencies: Seq[ModuleID] = Seq()
 }

test/controllers/BusinessVerificationControllerSpec.scala

@@ -220,7 +220,7 @@ class BusinessVerificationControllerSpec
           }
         }
 
-        "redirect to 'haveYouRegisteredUrl' if service is 'awrs' and enrolmentJourneyFeature is true, and no backlink is found" in {
+        "redirect to 'haveYouRegisteredUrl' if service is 'awrs', and no backlink is found" in {
           val mockAppConfig = mock[ApplicationConfig]
           val userId = s"user-${UUID.randomUUID}"
           val service = "awrs"
@@ -234,7 +234,6 @@ class BusinessVerificationControllerSpec
           ).thenReturn(Future.successful(None))
           when(mockAppConfig.getNavTitle(service)).thenReturn(Some("bc.awrs.serviceName"))
           when(mockAppConfig.serviceList).thenReturn(List(service))
-          when(mockAppConfig.enrolmentJourneyFeature).thenReturn(true)
           when(mockAppConfig.haveYouRegisteredUrl).thenReturn("http://localhost:9913/alcohol-wholesale-scheme/have-you-registered")
           when(mockAppConfig.businessTypeMap(service, isAgent = false)).thenReturn(Seq(
             "OBP" -> "bc.business-verification.PRT", "GROUP" -> "bc.business-verification.GROUP", "LTD" -> "bc.business-verification.LTD",