HTS-1629: Updated mongo libraries (#45)

hmrc · Mar 7, 2019 · 94c0654 · 94c0654
1 parent 2de4e4e
commit 94c0654
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,7 @@ val dependencies = Seq(
   "uk.gov.hmrc" %% "play-ui" % "7.31.0-play-25",
   "uk.gov.hmrc" %% "bootstrap-play-25" % "4.8.0",
   "org.mongodb.scala" %% "mongo-scala-driver" % "1.2.1",
-  "uk.gov.hmrc" %% "play-reactivemongo" % "6.2.0",
+  "uk.gov.hmrc" %% "simple-reactivemongo" % "7.12.0-play-25",
   "uk.gov.hmrc" %% "play-whitelist-filter" % "2.0.0",
   "com.github.kxbmap" %% "configs" % "0.4.4",
   "org.typelevel" %% "cats-core" % "1.5.0",
@@ -28,7 +28,7 @@ def testDependencies(scope: String = "test") = Seq(
   "com.typesafe.play" %% "play-test" % PlayVersion.current % scope,
   "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % scope,
   "uk.gov.hmrc" %% "stub-data-generator" % "0.5.3" % scope,
-  "uk.gov.hmrc" %% "reactivemongo-test" % "3.1.0" % scope
+  "uk.gov.hmrc" %% "reactivemongo-test" % "4.8.0-play-25" % scope
 )
 
 lazy val plugins: Seq[Plugins] = Seq.empty

diff --git a/conf/app.routes b/conf/app.routes
@@ -1,7 +1,6 @@
 # microservice specific routes
 
 GET        /                           @uk.gov.hmrc.helptosavetestadminfrontend.controllers.HelpToSaveApiController.availableFunctions()
-->         /dummy-pages                dummyPages.Routes
 
 POST       /delete-emails              @uk.gov.hmrc.helptosavetestadminfrontend.controllers.VerifiedEmailsController.deleteVerifiedEmails
 
@@ -29,4 +28,6 @@ GET        /account                    @uk.gov.hmrc.helptosavetestadminfrontend.
 
 GET        /curl-result                @uk.gov.hmrc.helptosavetestadminfrontend.controllers.HelpToSaveApiController.getCurlRequestIsPage(id: java.util.UUID)
 
+GET        /dummy-pages/account-homepage @uk.gov.hmrc.helptosavetestadminfrontend.controllers.DummyPagesController.accountHomepage
 
+GET        /dummy-pages/pay-in           @uk.gov.hmrc.helptosavetestadminfrontend.controllers.DummyPagesController.payIn
diff --git a/conf/dummyPages.routes b/conf/dummyPages.routes
diff --git a/test/repos/MongoTestSupport.scala b/test/repos/MongoTestSupport.scala
@@ -20,7 +20,6 @@ import org.scalamock.scalatest.MockFactory
 import play.api.libs.json.Json
 import play.modules.reactivemongo.ReactiveMongoComponent
 import reactivemongo.api.commands.{DefaultWriteResult, WriteError, WriteResult}
-import reactivemongo.api.DefaultDB
 import reactivemongo.bson.BSONObjectID
 import uk.gov.hmrc.mongo.{MongoConnector, ReactiveRepository}
 
@@ -42,9 +41,9 @@ trait MongoTestSupport[Data, Repo <: ReactiveRepository[Data, BSONObjectID]] {
 
   lazy val mongoStore: Repo = {
     val connector = mock[MongoConnector]
-    val db = stub[DefaultDB]
     (mockMongo.mongoConnector _).expects().returning(connector)
-    (connector.db _).expects().returning(() ⇒ db)
+    // we are using null as the constructor of DefaultDB is private
+    (connector.db _).expects().returning(() ⇒ null)
     newMongoStore()
   }