package-refactor: Fix deprecations move page specs into package

hmrc · Nov 7, 2024 · 3d4c194 · 3d4c194
1 parent 26d1244
commit 3d4c194
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/app/controllers/DownloadRequestSuccessController.scala b/app/controllers/DownloadRequestSuccessController.scala
@@ -45,7 +45,7 @@ class DownloadRequestSuccessController @Inject() (
         case _           =>
           logErrorsAndContinue(
             "Email was not found",
-            routes.IndexController.onPageLoad
+            routes.IndexController.onPageLoad()
           )
       }
   }

diff --git a/app/controllers/RequestDataController.scala b/app/controllers/RequestDataController.scala
@@ -49,7 +49,7 @@ class RequestDataController @Inject() (
         case _           =>
           logErrorsAndContinue(
             "Email was not found",
-            routes.IndexController.onPageLoad
+            routes.IndexController.onPageLoad()
           )
       }
   }

diff --git a/app/navigation/CategorisationNavigator.scala b/app/navigation/CategorisationNavigator.scala
@@ -27,18 +27,16 @@ import utils.Constants.firstAssessmentNumber
 import javax.inject.{Inject, Singleton}
 
 @Singleton
-class CategorisationNavigator  @Inject() (categorisationService: CategorisationService) extends NavigatorTrait {
+class CategorisationNavigator @Inject() (categorisationService: CategorisationService) extends NavigatorTrait {
 
   val normalRoutes: Page => UserAnswers => Call = {
-    case p: CategoryGuidancePage                   =>
+    case p: CategoryGuidancePage =>
       _ => routes.AssessmentController.onPageLoad(NormalMode, p.recordId, firstAssessmentNumber)
-    case _                          => _ => routes.IndexController.onPageLoad()
+    case _                       => _ => routes.IndexController.onPageLoad()
   }
 
-  val checkRoutes: Page => UserAnswers => Call = {
-
-    case _                      => _ => routes.JourneyRecoveryController.onPageLoad()
+  val checkRoutes: Page => UserAnswers => Call = { case _ =>
+    _ => routes.JourneyRecoveryController.onPageLoad()
   }
 
-
 }
diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ ThisBuild / scalaVersion := "2.13.12"
 lazy val microservice = (project in file("."))
   .enablePlugins(PlayScala, SbtDistributablesPlugin)
   .disablePlugins(JUnitXmlReportPlugin) //Required to prevent https://github.com/scalatest/scalatest/issues/1427
-  .settings(inConfig(Test)(testSettings): _*)
+  .settings(inConfig(Test)(testSettings) *)
   .settings(ThisBuild / useSuperShell := false)
   .settings(
     name := appName,
@@ -59,7 +59,7 @@ lazy val microservice = (project in file("."))
     Assets / pipelineStages := Seq(concat)
   )
 
-lazy val testSettings: Seq[Def.Setting[_]] = Seq(
+lazy val testSettings: Seq[Def.Setting[?]] = Seq(
   fork := true,
   unmanagedSourceDirectories += baseDirectory.value / "test-utils",
   scalafmtOnCompile := true
@@ -73,4 +73,6 @@ lazy val it =
 
 addCommandAlias("testAndCoverage", ";clean;coverage;test;it/test;coverageReport")
 addCommandAlias("prePR", ";scalafmt;test:scalafmt;testAndCoverage")
-addCommandAlias("preMerge", ";scalafmtCheckAll;testAndCoverage")
+addCommandAlias("preMerge", ";scalafmtCheckAll;testAndCoverage")
+
+scalacOptions += "-deprecation"
diff --git a/test/pages/HasNiphlPageSpec.scala → test/pages/profile/HasNiphlPageSpec.scala b/test/pages/HasNiphlPageSpec.scala → test/pages/profile/HasNiphlPageSpec.scala
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package pages
+package pages.profile
 
 import base.TestConstants.userAnswersId
 import models.UserAnswers
-import org.scalatest.{OptionValues, TryValues}
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.must.Matchers
-import pages.profile.{HasNiphlPage, NiphlNumberPage}
+import org.scalatest.{OptionValues, TryValues}
 
 class HasNiphlPageSpec extends AnyFreeSpec with Matchers with TryValues with OptionValues {
 

diff --git a/test/pages/HasNirmsPageSpec.scala → test/pages/profile/HasNirmsPageSpec.scala b/test/pages/HasNirmsPageSpec.scala → test/pages/profile/HasNirmsPageSpec.scala
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package pages
+package pages.profile
 
 import base.TestConstants.userAnswersId
 import models.UserAnswers
-import org.scalatest.{OptionValues, TryValues}
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.must.Matchers
-import pages.profile.{HasNirmsPage, NirmsNumberPage}
+import org.scalatest.{OptionValues, TryValues}
 
 class HasNirmsPageSpec extends AnyFreeSpec with Matchers with TryValues with OptionValues {
 

diff --git a/test/pages/RemoveNirmsPageSpec.scala → test/pages/profile/RemoveNirmsPageSpec.scala b/test/pages/RemoveNirmsPageSpec.scala → test/pages/profile/RemoveNirmsPageSpec.scala
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package pages
+package pages.profile
 
 import base.TestConstants.userAnswersId
 import models.UserAnswers
-import org.scalatest.{OptionValues, TryValues}
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.must.Matchers
-import pages.profile.{HasNirmsUpdatePage, NirmsNumberUpdatePage, RemoveNirmsPage}
+import org.scalatest.{OptionValues, TryValues}
 
 class RemoveNirmsPageSpec extends AnyFreeSpec with Matchers with TryValues with OptionValues {