Merge pull request #608 from hmrc/jackheslop96-patch-1

Added IntegrationPatience
hmrc · Feb 22, 2024 · 3c9d382 · 3c9d382
2 parents 428ca96 + aa8fb59
commit 3c9d382
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -69,11 +69,6 @@ lazy val microservice = (project in file("."))
     uglify / includeFilter := GlobFilter("application.js")
   )
 
-lazy val test = project
-  .settings(
-    fork := true
-  )
-
 lazy val it = project
   .enablePlugins(PlayScala)
   .dependsOn(microservice % "test->test") // the "test->test" allows reusing test code and test dependencies

diff --git a/it/test/connectors/CacheConnectorSpec.scala b/it/test/connectors/CacheConnectorSpec.scala
@@ -17,15 +17,15 @@
 package connectors
 
 import com.github.tomakehurst.wiremock.client.WireMock._
-import helpers.ItSpecBase
+import helpers.{ItSpecBase, WireMockServerHandler}
 import models.{LockCheck, UserAnswers}
 import org.scalacheck.Gen
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import play.api.inject.guice.GuiceApplicationBuilder
 import play.api.libs.json.{JsBoolean, Json}
 import play.api.test.Helpers._
 
-class CacheConnectorSpec extends ItSpecBase with ScalaCheckPropertyChecks {
+class CacheConnectorSpec extends ItSpecBase with WireMockServerHandler with ScalaCheckPropertyChecks {
 
   override def guiceApplicationBuilder(): GuiceApplicationBuilder =
     super

diff --git a/it/test/connectors/EnrolmentStoreConnectorSpec.scala b/it/test/connectors/EnrolmentStoreConnectorSpec.scala
@@ -17,7 +17,7 @@
 package connectors
 
 import com.github.tomakehurst.wiremock.client.WireMock.{aResponse, get, okJson, urlEqualTo}
-import helpers.ItSpecBase
+import helpers.{ItSpecBase, WireMockServerHandler}
 import org.scalacheck.Gen
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks.forAll
 import play.api.inject.guice.GuiceApplicationBuilder
@@ -26,7 +26,7 @@ import play.api.test.Helpers._
 
 import scala.concurrent.Future
 
-class EnrolmentStoreConnectorSpec extends ItSpecBase {
+class EnrolmentStoreConnectorSpec extends ItSpecBase with WireMockServerHandler {
 
   override def guiceApplicationBuilder(): GuiceApplicationBuilder =
     super

diff --git a/it/test/connectors/ReferenceDataConnectorSpec.scala b/it/test/connectors/ReferenceDataConnectorSpec.scala
@@ -19,7 +19,7 @@ package connectors
 import cats.data.NonEmptySet
 import com.github.tomakehurst.wiremock.client.WireMock._
 import connectors.ReferenceDataConnector.NoReferenceDataFoundException
-import helpers.ItSpecBase
+import helpers.{ItSpecBase, WireMockServerHandler}
 import models.reference._
 import org.scalacheck.Gen
 import org.scalatest.Assertion
@@ -29,7 +29,7 @@ import play.api.inject.guice.GuiceApplicationBuilder
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
-class ReferenceDataConnectorSpec extends ItSpecBase with ScalaCheckPropertyChecks {
+class ReferenceDataConnectorSpec extends ItSpecBase with WireMockServerHandler with ScalaCheckPropertyChecks {
 
   private val baseUrl = "customs-reference-data/test-only"
 

diff --git a/it/test/connectors/SubmissionConnectorSpec.scala b/it/test/connectors/SubmissionConnectorSpec.scala
@@ -17,14 +17,14 @@
 package connectors
 
 import com.github.tomakehurst.wiremock.client.WireMock._
-import helpers.ItSpecBase
+import helpers.{ItSpecBase, WireMockServerHandler}
 import org.scalacheck.Gen
 import play.api.inject.guice.GuiceApplicationBuilder
 import play.api.libs.json.JsNumber
 import play.api.test.Helpers._
 import uk.gov.hmrc.http.HttpResponse
 
-class SubmissionConnectorSpec extends ItSpecBase {
+class SubmissionConnectorSpec extends ItSpecBase with WireMockServerHandler {
 
   override def guiceApplicationBuilder(): GuiceApplicationBuilder =
     super

diff --git a/it/test/helpers/ItSpecBase.scala b/it/test/helpers/ItSpecBase.scala
@@ -18,15 +18,15 @@ package helpers
 
 import models.LocalReferenceNumber
 import org.scalatest.OptionValues
-import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures}
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.must.Matchers
 import org.scalatestplus.play.guice.GuiceOneServerPerSuite
 import play.api.Application
 import play.api.inject.guice.GuiceApplicationBuilder
 import uk.gov.hmrc.http.HeaderCarrier
 
-trait ItSpecBase extends AnyFreeSpec with Matchers with ScalaFutures with OptionValues with GuiceOneServerPerSuite with WireMockServerHandler {
+trait ItSpecBase extends AnyFreeSpec with Matchers with ScalaFutures with OptionValues with GuiceOneServerPerSuite with IntegrationPatience {
 
   val lrn: LocalReferenceNumber = LocalReferenceNumber("ABCD1234567890123").get