From 623b609e15f88e9bfc27141a6d18ddd0ed30b9f0 Mon Sep 17 00:00:00 2001 From: jackheslop96 <43777106+jackheslop96@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:55:47 +0000 Subject: [PATCH 1/2] Removed test val. --- build.sbt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.sbt b/build.sbt index 53a185d96..c7354be99 100644 --- 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 From aa8fb59beaa83890eae0a7d976694602477f23ce Mon Sep 17 00:00:00 2001 From: jackheslop96 <43777106+jackheslop96@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:56:38 +0000 Subject: [PATCH 2/2] Added IntegrationPatience. --- it/test/connectors/CacheConnectorSpec.scala | 4 ++-- it/test/connectors/EnrolmentStoreConnectorSpec.scala | 4 ++-- it/test/connectors/ReferenceDataConnectorSpec.scala | 4 ++-- it/test/connectors/SubmissionConnectorSpec.scala | 4 ++-- it/test/helpers/ItSpecBase.scala | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/it/test/connectors/CacheConnectorSpec.scala b/it/test/connectors/CacheConnectorSpec.scala index 56a1e676f..338c32205 100644 --- a/it/test/connectors/CacheConnectorSpec.scala +++ b/it/test/connectors/CacheConnectorSpec.scala @@ -17,7 +17,7 @@ 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 @@ -25,7 +25,7 @@ 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 index 987cd5ae7..7a7016ceb 100644 --- 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 index f54c1207e..d95847c61 100644 --- 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 index c614cedeb..03698f3b7 100644 --- 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 index cee11d929..2e7dfb2b2 100644 --- a/it/test/helpers/ItSpecBase.scala +++ b/it/test/helpers/ItSpecBase.scala @@ -18,7 +18,7 @@ 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 @@ -26,7 +26,7 @@ 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