Merge pull request #33 from hmrc/library-upgrade/everything-but-test-…

…libraries library upgrade
hmrc · Dec 21, 2017 · 12ea7b3 · 12ea7b3
2 parents 205ce6f + 7f90c23
commit 12ea7b3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/project/MicroServiceBuild.scala b/project/MicroServiceBuild.scala
@@ -6,16 +6,15 @@ private object AppDependencies {
 
   private val apiPlatformlibVersion = "1.3.0"
   private val domainVersion = "5.1.0"
-  private val hmrcTestVersion = "2.3.0"
+  private val hmrcTestVersion = "3.0.0"
   private val logbackJsonLoggerVersion = "3.1.0"
   private val metricsGraphiteVersion = "3.0.2"
   private val microserviceBootstrapVersion = "6.15.0"
   private val pegdownVersion = "1.6.0"
   private val playConfigVersion = "4.3.0"
-  private val playGraphiteVersion = "3.1.0"
   private val playHealthVersion = "2.1.0"
   private val playUrlBindersVersion = "2.1.0"
-  private val scalaTestVersion = "2.2.6"
+  private val scalaTestVersion = "3.0.0"
   private val authClientVersion = "2.5.0"
 
   val compile = Seq(
@@ -26,7 +25,6 @@ private object AppDependencies {
     "uk.gov.hmrc" %% "microservice-bootstrap" % microserviceBootstrapVersion,
     "uk.gov.hmrc" %% "auth-client" % authClientVersion,
     "uk.gov.hmrc" %% "play-config" % playConfigVersion,
-    "uk.gov.hmrc" %% "play-graphite" % playGraphiteVersion,
     "uk.gov.hmrc" %% "play-health" % playHealthVersion,
     "uk.gov.hmrc" %% "play-hmrc-api" % apiPlatformlibVersion,
     "uk.gov.hmrc" %% "play-url-binders" % playUrlBindersVersion
@@ -36,15 +34,11 @@ private object AppDependencies {
     private val scope = "test"
     def apply(): Seq[ModuleID] = Seq(
       "uk.gov.hmrc" %% "hmrctest" % hmrcTestVersion % scope,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % scope,
       "org.pegdown" % "pegdown" % pegdownVersion % scope,
       "com.typesafe.play" %% "play-test" % PlayVersion.current % scope,
       "org.mockito" % "mockito-core" % "1.9.0" % scope,
-      "info.cukes" %% "cucumber-scala" % "1.2.4" % scope,
-      "info.cukes" % "cucumber-junit" % "1.2.4" % scope,
-      "org.scalaj" %% "scalaj-http" % "1.1.5" % scope,
       "com.github.tomakehurst" % "wiremock" % "1.57" % scope,
-      "org.scalatestplus.play" %% "scalatestplus-play" % "1.5.1" % scope,
+      "org.scalatestplus.play" %% "scalatestplus-play" % "2.0.1" % scope,
       "com.github.java-json-tools" % "json-schema-validator" % "2.2.8" % scope
     )
   }

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,7 +6,7 @@ resolvers += Resolver.url("scoverage-bintray", url("https://dl.bintray.com/sksam
 
 addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.3.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.6.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.8.0")
 
 addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "0.9.0")
 

diff --git a/test/common/WSClientSetup.scala b/test/common/WSClientSetup.scala
@@ -16,12 +16,12 @@
 
 package common
 
-import org.scalatest.Suite
-import org.scalatestplus.play.OneServerPerSuite
+import org.scalatest.TestSuite
+import org.scalatestplus.play.guice.GuiceOneServerPerSuite
 import play.api.libs.ws.WSClient
 import uk.gov.hmrc.http.HeaderCarrier
 
-trait WSClientSetup extends OneServerPerSuite { self: Suite =>
+trait WSClientSetup extends GuiceOneServerPerSuite { self: TestSuite =>
   val baseUrl = s"http://localhost:$port"
 
   implicit val hc = HeaderCarrier()

diff --git a/test/uk/gov/hmrc/epayeapi/connectors/ConnectorSpec.scala b/test/uk/gov/hmrc/epayeapi/connectors/ConnectorSpec.scala
@@ -18,7 +18,7 @@ package uk.gov.hmrc.epayeapi.connectors
 
 import org.mockito.Mockito.when
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import play.api.http.Status
 import play.api.libs.json.{JsError, JsPath, Json}
 import uk.gov.hmrc.epayeapi.models.in._

diff --git a/test/uk/gov/hmrc/epayeapi/connectors/EpayeConnectorSpec.scala b/test/uk/gov/hmrc/epayeapi/connectors/EpayeConnectorSpec.scala
@@ -20,7 +20,7 @@ import common.EmpRefGenerator
 import org.joda.time.LocalDate
 import org.mockito.Mockito._
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import play.api.http.Status
 import uk.gov.hmrc.epayeapi.config.WSHttp
 import uk.gov.hmrc.epayeapi.models.in._

diff --git a/test/uk/gov/hmrc/epayeapi/connectors/ServiceLocatorConnectorSpec.scala b/test/uk/gov/hmrc/epayeapi/connectors/ServiceLocatorConnectorSpec.scala
@@ -18,7 +18,7 @@ package uk.gov.hmrc.epayeapi.connectors
 
 import org.mockito.Mockito._
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import uk.gov.hmrc.api.domain.Registration
 import uk.gov.hmrc.http.{HeaderCarrier, HttpPost, HttpResponse}
 import uk.gov.hmrc.play.test.UnitSpec

diff --git a/test/unit/AppSpec.scala b/test/unit/AppSpec.scala
@@ -19,8 +19,8 @@ package unit
 import akka.stream.Materializer
 import akka.util.ByteString
 import org.scalatest.concurrent.{Eventually, IntegrationPatience, ScalaFutures}
-import org.scalatest.mock.MockitoSugar
-import org.scalatest.{OptionValues, ShouldMatchers, fixture}
+import org.scalatest.mockito.MockitoSugar
+import org.scalatest.{Matchers, OptionValues, fixture}
 import org.scalatestplus.play.{MixedFixtures, WsScalaTestClient}
 import play.api.Application
 import play.api.inject.bind
@@ -34,7 +34,7 @@ import scala.reflect.ClassTag
 
 abstract class AppSpec
   extends fixture.WordSpec
-  with ShouldMatchers
+  with Matchers
   with MockitoSugar
   with ScalaFutures
   with OptionValues