@messages("unauthorised.guidance")
+ @heading1(messages("unauthorised.heading")) + @paragraph(Html(messages("unauthorised.p1"))) + @paragraph(Html(messages("unauthorised.p2"))) } diff --git a/conf/messages.en b/conf/messages.en index 5abc2ac79..841b28dca 100644 --- a/conf/messages.en +++ b/conf/messages.en @@ -75,5 +75,7 @@ signedOut.title = For your security, we signed you out signedOut.heading = For your security, we signed you out signedOut.guidance = We did not save your answers. -unauthorised.title = You can’t access this service with this account -unauthorised.heading = You can’t access this service with this account +unauthorised.title = There is a problem +unauthorised.heading = There is a problem +unauthorised.p1 = The details signed in to GOV.UK do not have a Trader Goods Profile. +unauthorised.p2 = If you have a Trader Goods Profile, sign out and sign in with the correct details. From 6114b79528b23e8f92844929af405f89c22d60a9 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Tue, 23 Apr 2024 11:29:47 +0100 Subject: [PATCH 02/12] TGP-548: added link --- app/views/UnauthorisedView.scala.html | 5 +++-- app/views/components/Link.scala.html | 21 +++++++++++++++++++++ conf/messages.en | 3 ++- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 app/views/components/Link.scala.html diff --git a/app/views/UnauthorisedView.scala.html b/app/views/UnauthorisedView.scala.html index 289534af0..9b35e5339 100644 --- a/app/views/UnauthorisedView.scala.html +++ b/app/views/UnauthorisedView.scala.html @@ -17,7 +17,8 @@ @this( layout: templates.Layout, paragraph: components.Paragraph, - heading1: components.Heading1 + heading1: components.Heading1, + link: components.Link ) @()(implicit request: Request[_], messages: Messages) @@ -29,5 +30,5 @@ ) { @heading1(messages("unauthorised.heading")) @paragraph(Html(messages("unauthorised.p1"))) - @paragraph(Html(messages("unauthorised.p2"))) + @paragraph(Html(messages("unauthorised.p2", link(messages("unauthorised.p2.linkText"), controllers.auth.routes.AuthController.signOut.url)))) } diff --git a/app/views/components/Link.scala.html b/app/views/components/Link.scala.html new file mode 100644 index 000000000..06f571000 --- /dev/null +++ b/app/views/components/Link.scala.html @@ -0,0 +1,21 @@ +@* + * Copyright 2024 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *@ + +@this() + +@(linkText: String, link: String, classes: String = "govuk-link") + +@linkText diff --git a/conf/messages.en b/conf/messages.en index 841b28dca..7d5a4da38 100644 --- a/conf/messages.en +++ b/conf/messages.en @@ -78,4 +78,5 @@ signedOut.guidance = We did not save your answers. unauthorised.title = There is a problem unauthorised.heading = There is a problem unauthorised.p1 = The details signed in to GOV.UK do not have a Trader Goods Profile. -unauthorised.p2 = If you have a Trader Goods Profile, sign out and sign in with the correct details. +unauthorised.p2 = If you have a Trader Goods Profile, {0} and sign in with the correct details. +unauthorised.p2.linkText = sign out From a4c28b928d5ff95150cd18504979026e98486486 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Tue, 23 Apr 2024 11:55:32 +0100 Subject: [PATCH 03/12] TGP-548: added links to other pages --- app/views/ProfileSetupView.scala.html | 9 +++++---- app/views/components/Link.scala.html | 4 ++-- conf/messages.en | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/ProfileSetupView.scala.html b/app/views/ProfileSetupView.scala.html index 3db692648..f6243cf5d 100644 --- a/app/views/ProfileSetupView.scala.html +++ b/app/views/ProfileSetupView.scala.html @@ -20,7 +20,8 @@ formHelper: FormWithCSRF, paragraph: components.Paragraph, heading1: components.Heading1, - heading2: components.Heading2 + heading2: components.Heading2, + link: components.Link, ) @()(implicit request: Request[_], messages: Messages) @@ -35,17 +36,17 @@ @heading2(messages("profileSetup.ukims.h2")) @paragraph(Html(messages("profileSetup.p1"))) @paragraph(Html(messages("profileSetup.p2"))) - @paragraph(Html(messages("profileSetup.p3", messages("profileSetup.p3.linkText")))) + @paragraph(Html(messages("profileSetup.p3", link(messages("profileSetup.p3.linkText"), "https://www.gov.uk/guidance/apply-for-authorisation-for-the-uk-internal-market-scheme-if-you-bring-goods-into-northern-ireland", "_blank")))) @heading2(messages("profileSetup.nirms.h2")) @paragraph(Html(messages("profileSetup.p4"))) @paragraph(Html(messages("profileSetup.p5"))) - @paragraph(Html(messages("profileSetup.p6", messages("profileSetup.p6.linkText")))) + @paragraph(Html(messages("profileSetup.p6", link(messages("profileSetup.p6.linkText"), "https://www.gov.uk/guidance/northern-ireland-retail-movement-scheme-how-to-register-and-seal-consignments", "_blank")))) @heading2(messages("profileSetup.niphl.h2")) @paragraph(Html(messages("profileSetup.p7"))) @paragraph(Html(messages("profileSetup.p8"))) - @paragraph(Html(messages("profileSetup.p9", messages("profileSetup.p9.linkText")))) + @paragraph(Html(messages("profileSetup.p9", link(messages("profileSetup.p9.linkText"), "https://www.gov.uk/guidance/moving-plants-from-great-britain-to-northern-ireland", "_blank")))) @formHelper(action = ProfileSetupController.onSubmit) { @govukButton( diff --git a/app/views/components/Link.scala.html b/app/views/components/Link.scala.html index 06f571000..cda82195e 100644 --- a/app/views/components/Link.scala.html +++ b/app/views/components/Link.scala.html @@ -16,6 +16,6 @@ @this() -@(linkText: String, link: String, classes: String = "govuk-link") +@(linkText: String, link: String, target: String = "_self", classes: String = "govuk-link") -@linkText +@linkText diff --git a/conf/messages.en b/conf/messages.en index 7d5a4da38..6cf032326 100644 --- a/conf/messages.en +++ b/conf/messages.en @@ -47,19 +47,19 @@ profileSetup.ukims.h2 = UK Internal Market Scheme (UKIMS) profileSetup.p1 = The trader who is registering for a Trader Goods Profile must be UKIMS registered. You’ll need your UKIMS numbers to set up your profile. profileSetup.p2 = If you’ve applied to UKIMS, HMRC will have sent you a letter with your UKIMS authorisation number. profileSetup.p3 = If you are not UKIMS registered, you can check here to find out {0}. -profileSetup.p3.linkText = who can apply to UKIMS +profileSetup.p3.linkText = who can apply to UKIMS profileSetup.nirms.h2 = Northern Ireland Retail Movement Scheme (NIRMS) profileSetup.p4 = Businesses responsible for selling or facilitating the movement of food for final consumption in Northern Ireland are eligible to benefit from the NIRMS arrangements. profileSetup.p5 = NIRMS registered traders can add their NIRMS authorisation to their Trader Goods Profile. Doing this will help categorise goods that are subject to NIRMS. profileSetup.p6 = NIRMS authorisation is optional for Trader Goods Profile. If you aren’t sure if you should be NIRMS authorised, find out about {0}. -profileSetup.p6.linkText = the Northern Ireland Retail Movement Scheme +profileSetup.p6.linkText = the Northern Ireland Retail Movement Scheme profileSetup.niphl.h2 = Northern Ireland plant health label (NIPHL) profileSetup.p7 = The NIPHL scheme is a way for growers and traders in Great Britain (England, Scotland and Wales) to move certain products to Northern Ireland. profileSetup.p8 = NIPHL registered traders can add their NIPHL authorisation to their Trader Goods Profile. Doing this will help categorise goods that are subject to NIPHL. profileSetup.p9 = NIPHL authorisation is optional for Trader Goods Profile. If you aren’t sure if you should be NIPHL authorised, find out about {0}. -profileSetup.p9.linkText = Moving plants from Great Britain to Northern Ireland +profileSetup.p9.linkText = Moving plants from Great Britain to Northern Ireland checkYourAnswers.title = Check Your Answers checkYourAnswers.heading = Check Your Answers From f0fbf6eb423d4260c42cfb28b54c8c61e876281f Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Tue, 23 Apr 2024 16:55:07 +0100 Subject: [PATCH 04/12] TGP-548: refactored tests with mocks --- test/base/SpecBase.scala | 13 +++++++++++- .../UnauthorisedControllerSpec.scala | 21 +++++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/test/base/SpecBase.scala b/test/base/SpecBase.scala index f6487a55c..51477c8b5 100644 --- a/test/base/SpecBase.scala +++ b/test/base/SpecBase.scala @@ -22,10 +22,12 @@ import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures} import org.scalatest.freespec.AnyFreeSpec import org.scalatest.matchers.must.Matchers import org.scalatest.{OptionValues, TryValues} +import org.scalatestplus.play.guice.GuiceOneAppPerSuite import play.api.Application import play.api.i18n.{Messages, MessagesApi} import play.api.inject.bind import play.api.inject.guice.GuiceApplicationBuilder +import play.api.mvc.{AnyContentAsEmpty, PlayBodyParsers} import play.api.test.FakeRequest trait SpecBase @@ -34,10 +36,19 @@ trait SpecBase with TryValues with OptionValues with ScalaFutures - with IntegrationPatience { + with IntegrationPatience + with GuiceOneAppPerSuite { val userAnswersId: String = "id" + val fakeRequest: FakeRequest[AnyContentAsEmpty.type] = FakeRequest() + + implicit val messagesApi: MessagesApi = app.injector.instanceOf[MessagesApi] + + val messages: Messages = messagesApi.preferred(fakeRequest) + + val defaultBodyParser: PlayBodyParsers = app.injector.instanceOf[PlayBodyParsers] + def emptyUserAnswers: UserAnswers = UserAnswers(userAnswersId) def messages(app: Application): Messages = app.injector.instanceOf[MessagesApi].preferred(FakeRequest()) diff --git a/test/controllers/UnauthorisedControllerSpec.scala b/test/controllers/UnauthorisedControllerSpec.scala index 2b0f0d0c3..8487577e4 100644 --- a/test/controllers/UnauthorisedControllerSpec.scala +++ b/test/controllers/UnauthorisedControllerSpec.scala @@ -17,28 +17,27 @@ package controllers import base.SpecBase -import play.api.test.FakeRequest import play.api.test.Helpers._ import views.html.UnauthorisedView class UnauthorisedControllerSpec extends SpecBase { - "Unauthorised Controller" - { + private val unauthorisedView = app.injector.instanceOf[UnauthorisedView] - "must return OK and the correct view for a GET" in { + private val unauthorisedController = new UnauthorisedController( + stubMessagesControllerComponents(), + unauthorisedView + ) - val application = applicationBuilder(userAnswers = Some(emptyUserAnswers)).build() + "Unauthorised Controller" - { - running(application) { - val request = FakeRequest(GET, routes.UnauthorisedController.onPageLoad.url) + "must return OK and the correct view for a GET" in { - val result = route(application, request).value + val result = unauthorisedController.onPageLoad(fakeRequest) - val view = application.injector.instanceOf[UnauthorisedView] + status(result) mustEqual OK - status(result) mustEqual OK - contentAsString(result) mustEqual view()(request, messages(application)).toString - } + contentAsString(result) mustEqual unauthorisedView()(fakeRequest, stubMessages()).toString } } } From 2756051e710323a216dc2d4aef19b602f7a02c58 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Wed, 24 Apr 2024 08:23:28 +0100 Subject: [PATCH 05/12] TGP-548: changed it tests to include redirect --- .../UnauthorisedControllerISpec.scala | 41 +++++++++++ it/test/helpers/ItTestBase.scala | 72 +++++++++++++++++++ .../repositories/SessionRepositorySpec.scala | 16 +++++ it/test/resources/application.conf | 14 ++++ 4 files changed, 143 insertions(+) create mode 100644 it/test/controllers/UnauthorisedControllerISpec.scala create mode 100644 it/test/helpers/ItTestBase.scala diff --git a/it/test/controllers/UnauthorisedControllerISpec.scala b/it/test/controllers/UnauthorisedControllerISpec.scala new file mode 100644 index 000000000..527038f63 --- /dev/null +++ b/it/test/controllers/UnauthorisedControllerISpec.scala @@ -0,0 +1,41 @@ +/* + * Copyright 2024 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package controllers + +import helpers.ItTestBase +import play.api.http.Status.{BAD_REQUEST, OK, SEE_OTHER} +import play.api.libs.ws.{WSClient, WSRequest} +import play.api.test.Helpers.{await, defaultAwaitTimeout} + +class UnauthorisedControllerISpec extends ItTestBase { + + lazy val client: WSClient = app.injector.instanceOf[WSClient] + + private val url = s"http://localhost:$port$appRouteContext/unauthorised" + + "Unauthorised controller" should { + + "loads page" in { + + val request: WSRequest = client.url(url).withFollowRedirects(false) + + val response = await(request.get()) + + response.status mustBe OK + } + } +} diff --git a/it/test/helpers/ItTestBase.scala b/it/test/helpers/ItTestBase.scala new file mode 100644 index 000000000..f3fac1ad0 --- /dev/null +++ b/it/test/helpers/ItTestBase.scala @@ -0,0 +1,72 @@ +/* + * Copyright 2024 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package helpers + +import org.mockito.ArgumentMatchers.any +import org.mockito.ArgumentMatchersSugar.eqTo +import org.mockito.Mockito.when +import org.mockito.stubbing.OngoingStubbing +import org.scalacheck.Gen +import org.scalatestplus.mockito.MockitoSugar.mock +import org.scalatestplus.play.PlaySpec +import org.scalatestplus.play.guice.GuiceOneServerPerSuite +import play.api.Application +import play.api.http.HeaderNames +import play.api.inject.guice.GuiceApplicationBuilder +import uk.gov.hmrc.auth.core.{AuthConnector, Enrolment, Enrolments} +import play.api.inject.bind +import play.api.libs.ws.WSResponse +import uk.gov.hmrc.auth.core.retrieve.v2.Retrievals +import uk.gov.hmrc.auth.core.retrieve.~ +import uk.gov.hmrc.auth.core.syntax.retrieved.authSyntaxForRetrieved + +import scala.concurrent.Future + +trait ItTestBase extends PlaySpec with GuiceOneServerPerSuite { + + val appRouteContext: String = "/trader-goods-profiles" + + lazy val authConnector: AuthConnector = mock[AuthConnector] + + def appBuilder: GuiceApplicationBuilder = + GuiceApplicationBuilder() + .overrides( + bind[AuthConnector].to(authConnector) + ) + + override implicit lazy val app: Application = appBuilder.build() + + private val authFetch = Retrievals.internalId and Retrievals.authorisedEnrolments + private val ourEnrolment: Enrolment = + Enrolment("HMRC-CUS-ORG").withIdentifier("fake-identifier", Gen.alphaNumStr.sample.get) + private val authResult = Some("internalId") and Enrolments(Set(ourEnrolment)) + + def authorisedUser: OngoingStubbing[Future[Option[String] ~ Enrolments]] = + when(authConnector.authorise(any, eqTo(authFetch))(any, any)).thenReturn( + Future.successful(authResult) + ) + + def noEnrolment: OngoingStubbing[Future[Option[String] ~ Enrolments]] = { + val authResult = Some("internalId") and Enrolments(Set.empty) + when(authConnector.authorise(any, eqTo(authFetch))(any, any)).thenReturn( + Future.successful(authResult) + ) + } + + def redirectUrl(response: WSResponse): Option[String] = + response.header(HeaderNames.LOCATION) +} diff --git a/it/test/repositories/SessionRepositorySpec.scala b/it/test/repositories/SessionRepositorySpec.scala index ecb3a50ba..a4c1e2519 100644 --- a/it/test/repositories/SessionRepositorySpec.scala +++ b/it/test/repositories/SessionRepositorySpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2024 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package repositories import config.FrontendAppConfig diff --git a/it/test/resources/application.conf b/it/test/resources/application.conf index 24399c0cc..122472045 100644 --- a/it/test/resources/application.conf +++ b/it/test/resources/application.conf @@ -1,3 +1,17 @@ +# Copyright 2024 HM Revenue & Customs +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + mongodb.uri = "mongodb://localhost:27017/trader-goods-profiles-frontend-integration" pekko { From 4408770f6ac840fd4f3f6fd9bae8b13965826224 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:04:04 +0100 Subject: [PATCH 06/12] TGP-548: added dependency --- project/AppDependencies.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index 7396c017a..8e8f4128e 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -15,7 +15,8 @@ object AppDependencies { val test = Seq( "uk.gov.hmrc" %% "bootstrap-test-play-30" % bootstrapVersion, "uk.gov.hmrc.mongo" %% "hmrc-mongo-test-play-30" % hmrcMongoVersion, - "org.scalatestplus" %% "scalacheck-1-17" % "3.2.17.0" + "org.scalatestplus" %% "scalacheck-1-17" % "3.2.17.0", + "org.mockito" %% "mockito-scala" % "1.17.12" ).map(_ % Test) def apply(): Seq[ModuleID] = compile ++ test From b0d811d2df27fb74c5d69b5ebd9718bac689cb9b Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:14:17 +0100 Subject: [PATCH 07/12] TGP-548: linting --- app/views/ProfileSetupView.scala.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/views/ProfileSetupView.scala.html b/app/views/ProfileSetupView.scala.html index c36214f08..22c288f6b 100644 --- a/app/views/ProfileSetupView.scala.html +++ b/app/views/ProfileSetupView.scala.html @@ -21,7 +21,7 @@ paragraph: components.Paragraph, heading1: components.Heading1, heading2: components.Heading2, - link: components.Link, + link: components.Link ) @()(implicit request: Request[_], messages: Messages) @@ -36,17 +36,20 @@ @heading2(messages("profileSetup.ukims.h2")) @paragraph(Html(messages("profileSetup.p1"))) @paragraph(Html(messages("profileSetup.p2"))) - @paragraph(Html(messages("profileSetup.p3", link(messages("profileSetup.p3.linkText"), "https://www.gov.uk/guidance/apply-for-authorisation-for-the-uk-internal-market-scheme-if-you-bring-goods-into-northern-ireland")))) + @paragraph(Html(messages("profileSetup.p3", link(messages("profileSetup.p3.linkText"), + "https://www.gov.uk/guidance/apply-for-authorisation-for-the-uk-internal-market-scheme-if-you-bring-goods-into-northern-ireland")))) @heading2(messages("profileSetup.nirms.h2")) @paragraph(Html(messages("profileSetup.p4"))) @paragraph(Html(messages("profileSetup.p5"))) - @paragraph(Html(messages("profileSetup.p6", link(messages("profileSetup.p6.linkText"), "https://www.gov.uk/guidance/northern-ireland-retail-movement-scheme-how-to-register-and-seal-consignments")))) + @paragraph(Html(messages("profileSetup.p6", link(messages("profileSetup.p6.linkText"), + "https://www.gov.uk/guidance/northern-ireland-retail-movement-scheme-how-to-register-and-seal-consignments")))) @heading2(messages("profileSetup.niphl.h2")) @paragraph(Html(messages("profileSetup.p7"))) @paragraph(Html(messages("profileSetup.p8"))) - @paragraph(Html(messages("profileSetup.p9", link(messages("profileSetup.p9.linkText"), "https://www.gov.uk/guidance/moving-plants-from-great-britain-to-northern-ireland")))) + @paragraph(Html(messages("profileSetup.p9", link(messages("profileSetup.p9.linkText"), + "https://www.gov.uk/guidance/moving-plants-from-great-britain-to-northern-ireland")))) @formHelper(action = ProfileSetupController.onSubmit) { @govukButton( From 23ab4b6f0ad382e689f154b3a29334b4ed8335a8 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:17:28 +0100 Subject: [PATCH 08/12] TGP-548: added classes in link --- app/views/components/Link.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/components/Link.scala.html b/app/views/components/Link.scala.html index cda82195e..67279f18a 100644 --- a/app/views/components/Link.scala.html +++ b/app/views/components/Link.scala.html @@ -18,4 +18,4 @@ @(linkText: String, link: String, target: String = "_self", classes: String = "govuk-link") -@linkText +@linkText From 414f7dfcf00950d44b65a4916daf0cda6cde6cb6 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:58:57 +0100 Subject: [PATCH 09/12] TGP-548: extracted eori and used config in it test --- it/test/helpers/ItTestBase.scala | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/it/test/helpers/ItTestBase.scala b/it/test/helpers/ItTestBase.scala index f3fac1ad0..89b27faac 100644 --- a/it/test/helpers/ItTestBase.scala +++ b/it/test/helpers/ItTestBase.scala @@ -16,6 +16,7 @@ package helpers +import config.FrontendAppConfig import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchersSugar.eqTo import org.mockito.Mockito.when @@ -39,6 +40,7 @@ import scala.concurrent.Future trait ItTestBase extends PlaySpec with GuiceOneServerPerSuite { val appRouteContext: String = "/trader-goods-profiles" + private val mockAppConfig = mock[FrontendAppConfig] lazy val authConnector: AuthConnector = mock[AuthConnector] @@ -49,11 +51,12 @@ trait ItTestBase extends PlaySpec with GuiceOneServerPerSuite { ) override implicit lazy val app: Application = appBuilder.build() - - private val authFetch = Retrievals.internalId and Retrievals.authorisedEnrolments - private val ourEnrolment: Enrolment = - Enrolment("HMRC-CUS-ORG").withIdentifier("fake-identifier", Gen.alphaNumStr.sample.get) - private val authResult = Some("internalId") and Enrolments(Set(ourEnrolment)) + private val appConfig = app.injector.instanceOf[FrontendAppConfig] + private val eori = Gen.alphaNumStr.sample.get + private val authFetch = Retrievals.internalId and Retrievals.authorisedEnrolments + private val ourEnrolment: Enrolment = + Enrolment(appConfig.tgpEnrolmentIdentifier.key).withIdentifier(appConfig.tgpEnrolmentIdentifier.identifier, eori) + private val authResult = Some("internalId") and Enrolments(Set(ourEnrolment)) def authorisedUser: OngoingStubbing[Future[Option[String] ~ Enrolments]] = when(authConnector.authorise(any, eqTo(authFetch))(any, any)).thenReturn( From 0e23cf39f79f4947919f3d943fafefe48724de51 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:02:25 +0100 Subject: [PATCH 10/12] TGP-449: unused imports removed --- it/test/controllers/UnauthorisedControllerISpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/test/controllers/UnauthorisedControllerISpec.scala b/it/test/controllers/UnauthorisedControllerISpec.scala index 527038f63..baf852c47 100644 --- a/it/test/controllers/UnauthorisedControllerISpec.scala +++ b/it/test/controllers/UnauthorisedControllerISpec.scala @@ -17,7 +17,7 @@ package controllers import helpers.ItTestBase -import play.api.http.Status.{BAD_REQUEST, OK, SEE_OTHER} +import play.api.http.Status.OK import play.api.libs.ws.{WSClient, WSRequest} import play.api.test.Helpers.{await, defaultAwaitTimeout} From e9f0cdd7c2cacf20054eff256dccc5990a88fc02 Mon Sep 17 00:00:00 2001 From: besscerule <63503574+besscerule@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:29:10 +0100 Subject: [PATCH 11/12] TGP-548: fixing build --- build.sbt | 2 +- project/plugins.sbt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ec4c6c4a0..3a200e8a4 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ lazy val microservice = (project in file(".")) ScoverageKeys.coverageExcludedFiles := "