[MIBM-145][ph] add VehicleSizePageSpec (#93)

* [MIBM-145][ph] add VehicleSizePageSpec

* [MIBM-145] tidy BasePageSpec

app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/GoodsInVehicleView.scala.html

@@ -38,6 +38,6 @@
             legendAsHeading = true
         )
 
-        @button("site.continue")
+        @button("site.continue", name=Some("continue"))
     }
 }

app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/VehicleSizeView.scala.html

@@ -39,6 +39,6 @@
             legendAsHeading = true
         )
 
-        @button("site.continue")
+        @button("site.continue", name=Some("continue"))
     }
 }

test/uk/gov/hmrc/merchandiseinbaggagefrontend/CoreTestData.scala

@@ -21,6 +21,8 @@ import java.time.LocalDate
 import uk.gov.hmrc.merchandiseinbaggagefrontend.controllers.testonly.TestOnlyController
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.api._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.calculation.CalculationResult
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.DeclarationType.Import
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.GoodsDestinations.GreatBritain
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.GoodsVatRates.Twenty
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.Ports.{Dover, Heathrow}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.No
@@ -37,7 +39,10 @@ trait CoreTestData {
 
   val sessionId: SessionId = SessionId()
 
-  val startedImportJourney: DeclarationJourney = DeclarationJourney(sessionId, DeclarationType.Import)
+  val startedImportJourney: DeclarationJourney = DeclarationJourney(sessionId, Import)
+
+  val startedImportToGreatBritainJourney: DeclarationJourney =
+    startedImportJourney.copy(maybeGoodsDestination = Some(GreatBritain))
 
   val completedGoodsEntry: GoodsEntry = TestOnlyController.completedGoodsEntry
 

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/AgentDetailsPageSpec.scala

@@ -16,12 +16,13 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.DeclarationJourney
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.AgentDetailsPage
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.AgentDetailsPage._
 
 class AgentDetailsPageSpec extends DeclarationDataCapturePageSpec[String, AgentDetailsPage] {
-  override lazy val page: AgentDetailsPage = agentDetailsPage
+  override lazy val page: AgentDetailsPage = wire[AgentDetailsPage]
 
   "the page" should {
     behave like aPageWhichRequiresADeclarationJourney(path)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/BasePageSpec.scala

@@ -19,8 +19,8 @@ package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 import com.softwaremill.macwire.wire
 import org.openqa.selenium.htmlunit.HtmlUnitDriver
 import org.scalatestplus.selenium.WebBrowser
-import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, GoodsDestination, GoodsVatRate, YesNo}
-import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{RadioButtonPage, TravellerDetailsPage, _}
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.DeclarationJourney
+import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.{BaseSpecWithApplication, CoreTestData, WireMockSupport}
 
 trait BasePageSpec[P <: BasePage] extends BaseSpecWithApplication with WireMockSupport with CoreTestData {
@@ -40,26 +40,6 @@ trait BasePageSpec[P <: BasePage] extends BaseSpecWithApplication with WireMockS
   lazy val testOnlyDeclarationJourneyPage: TestOnlyDeclarationJourneyPage = wire[TestOnlyDeclarationJourneyPage]
   lazy val startImportPage: StartImportPage = wire[StartImportPage]
   lazy val startExportPage: StartExportPage = wire[StartExportPage]
-  lazy val exciseAndRestrictedGoodsPage: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
-  lazy val goodsDestinationPage:   RadioButtonPage[GoodsDestination] = wire[RadioButtonPage[GoodsDestination]]
-  lazy val goodsRouteDestinationPage: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
-  lazy val valueWeightOfGoodsPage: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
-  lazy val searchGoodsPage: SearchGoodsPage = wire[SearchGoodsPage]
-  lazy val goodsVatRatePage: RadioButtonPage[GoodsVatRate] = wire[RadioButtonPage[GoodsVatRate]]
-  lazy val searchGoodsCountryPage: SearchGoodsCountryPage = wire[SearchGoodsCountryPage]
-  lazy val purchaseDetailsPage: PurchaseDetailsPage = wire[PurchaseDetailsPage]
-  lazy val invoiceNumberPage: InvoiceNumberPage = wire[InvoiceNumberPage]
-  lazy val reviewGoodsPage: ReviewGoodsPage = wire[ReviewGoodsPage]
-  lazy val removeGoodsPage: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
-  lazy val goodsRemovedPage: GoodsRemovedPage = wire[GoodsRemovedPage]
-  lazy val agentDetailsPage: AgentDetailsPage = wire[AgentDetailsPage]
-  lazy val paymentCalculationPage: PaymentCalculationPage = wire[PaymentCalculationPage]
-  lazy val eoriNumberPage: EoriNumberPage = wire[EoriNumberPage]
-  lazy val travellerDetailsPage: TravellerDetailsPage = wire[TravellerDetailsPage]
-  lazy val journeyDetailsPage: JourneyDetailsPage = wire[JourneyDetailsPage]
-  lazy val vehicleRegistrationNumberPage: VehicleRegistrationNumberPage = wire[VehicleRegistrationNumberPage]
-  lazy val checkYourAnswersPage: CheckYourAnswersPage = wire[CheckYourAnswersPage]
-  lazy val customsAgentPage: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
 
   def givenAnImportJourneyIsStarted(): Unit = {
     open(StartImportPage.path)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/CheckYourAnswersPageSpec.scala

@@ -16,12 +16,13 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.CheckYourAnswersPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CheckYourAnswersPage, InvalidRequestPage}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.stubs.PayApiStub._
 
 class CheckYourAnswersPageSpec extends BasePageSpec[CheckYourAnswersPage] with TaxCalculation{
-  override lazy val page: CheckYourAnswersPage = checkYourAnswersPage
+  override lazy val page: CheckYourAnswersPage = wire[CheckYourAnswersPage]
 
   "the page" should {
     behave like aPageWhichRequiresADeclarationJourney(path)
@@ -33,8 +34,8 @@ class CheckYourAnswersPageSpec extends BasePageSpec[CheckYourAnswersPage] with T
 
         open(path)
 
-        checkYourAnswersPage.mustRenderBasicContent(path, title)
-        checkYourAnswersPage.mustRenderDetail(declaration, taxDue.totalTaxDue)
+        page.mustRenderBasicContent(path, title)
+        page.mustRenderDetail(declaration, taxDue.totalTaxDue)
       }
 
       "the declaration is complete but sparse" in {

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/CustomsAgentPageSpec.scala

@@ -16,14 +16,15 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.CoreTestData
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.{No, Yes}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, YesNo}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.CustomsAgentPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{AgentDetailsPage, EoriNumberPage, RadioButtonPage}
 
 class CustomsAgentPageSpec extends DeclarationDataCapturePageSpec[YesNo, RadioButtonPage[YesNo]] with CoreTestData {
-  override lazy val page: RadioButtonPage[YesNo] = customsAgentPage
+  override lazy val page: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
 
 
   "the page" should {
@@ -36,7 +37,7 @@ class CustomsAgentPageSpec extends DeclarationDataCapturePageSpec[YesNo, RadioBu
         givenADeclarationJourney(completedDeclarationJourney.copy(maybeIsACustomsAgent = None))
         open(path)
 
-        customsAgentPage.mustRenderBasicContent(path, title)
+        page.mustRenderBasicContent(path, title)
       }
     }
   }

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/EoriNumberPageSpec.scala

@@ -16,13 +16,14 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.{No, Yes}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, Eori}
-import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{EoriNumberPage, TravellerDetailsPage}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.EoriNumberPage._
+import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{EoriNumberPage, TravellerDetailsPage}
 
 class EoriNumberPageSpec extends DeclarationDataCapturePageSpec[Eori, EoriNumberPage] {
-  override lazy val page: EoriNumberPage = eoriNumberPage
+  override lazy val page: EoriNumberPage = wire[EoriNumberPage]
 
   private val eori = Eori("GB123467800000")
 

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/ExciseAndRestrictedGoodsPageSpec.scala

@@ -16,27 +16,24 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
-import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.GoodsDestinations.GreatBritain
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.{No, Yes}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, YesNo}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.ExciseAndRestrictedGoodsPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CannotUseServicePage, RadioButtonPage, ValueWeightOfGoodsPage}
 
 class ExciseAndRestrictedGoodsPageSpec extends DeclarationDataCapturePageSpec[YesNo, RadioButtonPage[YesNo]] {
-  override lazy val page: RadioButtonPage[YesNo] = exciseAndRestrictedGoodsPage
+  override lazy val page: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
 
-  private def setup(): Unit =
-    givenADeclarationJourney(startedImportJourney.copy(
-      maybeGoodsDestination = Some(GreatBritain)
-    ))
+  private def setup(): Unit = givenADeclarationJourney(startedImportToGreatBritainJourney)
 
   "the excise and restricted goods page" should {
     behave like aPageWhichRenders(path, givenAnImportJourneyIsStarted(), importTitle)
     behave like aPageWhichRenders(path, givenAnExportJourneyIsStarted(), exportTitle)
     behave like aPageWhichDisplaysPreviouslyEnteredAnswers(path)
     behave like aPageWhichRequiresADeclarationJourney(path)
-    behave like aDataCapturePageWithConditionalRouting(path, setup, No, ValueWeightOfGoodsPage.path)
-    behave like aDataCapturePageWithConditionalRouting(path, setup, Yes, CannotUseServicePage.path)
+    behave like aDataCapturePageWithConditionalRouting(path, setup(), No, ValueWeightOfGoodsPage.path)
+    behave like aDataCapturePageWithConditionalRouting(path, setup(), Yes, CannotUseServicePage.path)
   }
 
   override def extractFormDataFrom(declarationJourney: DeclarationJourney): Option[YesNo] =

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/GoodsDestinationPageSpec.scala

@@ -16,13 +16,14 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.GoodsDestinations.{GreatBritain, NorthernIreland}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, GoodsDestination}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.GoodsDestinationPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{ExciseAndRestrictedGoodsPage, GoodsRouteDestinationPage, RadioButtonPage}
 
 class GoodsDestinationPageSpec extends DeclarationDataCapturePageSpec[GoodsDestination, RadioButtonPage[GoodsDestination]] {
-  override lazy val page: RadioButtonPage[GoodsDestination] = goodsDestinationPage
+  override lazy val page: RadioButtonPage[GoodsDestination] = wire[RadioButtonPage[GoodsDestination]]
 
   "the goods destination page" should {
     behave like aPageWhichRenders(path, givenAnImportJourneyIsStarted(), importTitle)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/GoodsInVehiclePageSpec.scala

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 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 uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
+
+import com.softwaremill.macwire.wire
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.{No, Yes}
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, YesNo}
+import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.GoodsInVehiclePage._
+import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CheckYourAnswersPage, RadioButtonPage, VehicleSizePage}
+
+class GoodsInVehiclePageSpec extends DeclarationDataCapturePageSpec[YesNo, RadioButtonPage[YesNo]] {
+  override lazy val page: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
+
+  "the excise and restricted goods page" should {
+    behave like aPageWhichRequiresADeclarationJourney(path)
+    behave like aPageWhichRenders(path, givenAnImportJourneyIsStarted(), title)
+    behave like aPageWhichDisplaysPreviouslyEnteredAnswers(path)
+    behave like aDataCapturePageWithConditionalRouting(path, givenAnImportJourneyIsStarted(), Yes, VehicleSizePage.path)
+    behave like aDataCapturePageWithConditionalRouting(
+      path,
+      givenADeclarationJourney(completedDeclarationJourney.copy(maybeTravellingByVehicle = None)),
+      No,
+      CheckYourAnswersPage.path)
+  }
+
+  override def extractFormDataFrom(declarationJourney: DeclarationJourney): Option[YesNo] = declarationJourney.maybeTravellingByVehicle
+}

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/GoodsRemovedPageSpec.scala

@@ -16,11 +16,12 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.GoodsRemovedPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{GoodsRemovedPage, SearchGoodsPage, StartImportPage}
 
 class GoodsRemovedPageSpec extends BasePageSpec[GoodsRemovedPage] {
-  override def page: GoodsRemovedPage = goodsRemovedPage
+  override def page: GoodsRemovedPage = wire[GoodsRemovedPage]
 
   "the goods removed page" should {
     behave like aPageWhichRequiresADeclarationJourney(path)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/GoodsRouteDestinationPageSpec.scala

@@ -16,13 +16,14 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
-import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, YesNo}
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.{No, Yes}
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, YesNo}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.GoodsRouteDestinationPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CannotUseServiceIrelandPage, ExciseAndRestrictedGoodsPage, NoDeclarationNeededPage, RadioButtonPage}
 
 class GoodsRouteDestinationPageSpec extends DeclarationDataCapturePageSpec[YesNo, RadioButtonPage[YesNo]] {
-  override lazy val page: RadioButtonPage[YesNo] = goodsRouteDestinationPage
+  override lazy val page: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
 
   "the goods route destination page" should {
     behave like aPageWhichRenders(path, givenAnImportJourneyIsStarted(), importTitle)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/GoodsVatRatePageSpec.scala

@@ -16,13 +16,14 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.GoodsVatRates.Twenty
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{GoodsEntry, GoodsVatRate}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.GoodsVatRatePage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{RadioButtonPage, SearchGoodsCountryPage}
 
 class GoodsVatRatePageSpec extends GoodsEntryPageSpec[GoodsVatRate, RadioButtonPage[GoodsVatRate]] {
-  override lazy val page: RadioButtonPage[GoodsVatRate] = goodsVatRatePage
+  override lazy val page: RadioButtonPage[GoodsVatRate] = wire[RadioButtonPage[GoodsVatRate]]
 
   "the goods vat rate page" should {
     behave like aGoodsEntryPage(path, title, Twenty, Some(SearchGoodsCountryPage.path))

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/InvoiceNumberPageSpec.scala

@@ -16,13 +16,14 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import org.scalatest.concurrent.ScalaFutures
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.GoodsEntry
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.InvoiceNumberPage
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.InvoiceNumberPage._
 
 class InvoiceNumberPageSpec extends GoodsEntryPageSpec[String, InvoiceNumberPage] with ScalaFutures {
-  override lazy val page: InvoiceNumberPage = invoiceNumberPage
+  override lazy val page: InvoiceNumberPage = wire[InvoiceNumberPage]
 
   "the invoice number page" should {
     behave like aGoodsEntryPage(path, title, "Invoice123", None)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/JourneyDetailsPageSpec.scala

@@ -16,13 +16,14 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import org.scalatest.concurrent.ScalaFutures
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{DeclarationJourney, JourneyDetailsEntry}
-import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CheckYourAnswersPage, GoodsInVehiclePage, InvalidRequestPage, JourneyDetailsPage}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.JourneyDetailsPage._
+import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CheckYourAnswersPage, GoodsInVehiclePage, InvalidRequestPage, JourneyDetailsPage}
 
 class JourneyDetailsPageSpec extends DeclarationDataCapturePageSpec[JourneyDetailsEntry, JourneyDetailsPage] with ScalaFutures {
-  override lazy val page: JourneyDetailsPage = journeyDetailsPage
+  override lazy val page: JourneyDetailsPage = wire[JourneyDetailsPage]
 
   "the journey details page" should {
     behave like aPageWhichRenders(path, givenAnImportJourneyIsStarted(), title)

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/PaymentCalculationPageSpec.scala

@@ -16,11 +16,12 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.PaymentCalculationPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{CustomsAgentPage, PaymentCalculationPage}
 
 class PaymentCalculationPageSpec extends BasePageSpec[PaymentCalculationPage] with TaxCalculation {
-  override def page: PaymentCalculationPage = paymentCalculationPage
+  override def page: PaymentCalculationPage = wire[PaymentCalculationPage]
 
   private def setUpTaxCalculationAndOpenPage() = {
     val taxCalculation = givenADeclarationWithTaxDue(importJourneyWithTwoCompleteGoodsEntries).futureValue

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/PurchaseDetailsPageSpec.scala

@@ -16,14 +16,15 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
+import com.softwaremill.macwire.wire
 import org.scalatest.concurrent.ScalaFutures
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{GoodsEntry, PurchaseDetailsInput}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.PurchaseDetailsPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{InvoiceNumberPage, PurchaseDetailsPage}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.stubs.CurrencyConversionStub.givenCurrenciesAreFound
 
 class PurchaseDetailsPageSpec extends GoodsEntryPageSpec[PurchaseDetailsInput, PurchaseDetailsPage] with ScalaFutures {
-  override lazy val page: PurchaseDetailsPage = purchaseDetailsPage
+  override lazy val page: PurchaseDetailsPage = wire[PurchaseDetailsPage]
 
   override def beforeEach(): Unit = {
     super.beforeEach()

test/uk/gov/hmrc/merchandiseinbaggagefrontend/pagespecs/RemoveGoodsPageSpec.scala

@@ -16,15 +16,16 @@
 
 package uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs
 
-import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{GoodsEntry, YesNo}
+import com.softwaremill.macwire.wire
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.YesNo.{No, Yes}
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.core.{GoodsEntry, YesNo}
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.RemoveGoodsPage._
 import uk.gov.hmrc.merchandiseinbaggagefrontend.pagespecs.pages.{GoodsRemovedPage, RadioButtonPage, ReviewGoodsPage}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
 class RemoveGoodsPageSpec extends BasePageSpec[RadioButtonPage[YesNo]] {
-  override def page: RadioButtonPage[YesNo] = removeGoodsPage
+  override def page: RadioButtonPage[YesNo] = wire[RadioButtonPage[YesNo]]
 
   "the remove goods page" should {
     behave like aPageWhichRequiresADeclarationJourney(path(1))