From faf96bdb1068e36665888396f51846ad4b2d5817 Mon Sep 17 00:00:00 2001 From: Maris Ruskulis Date: Thu, 16 Jul 2015 15:01:55 +0300 Subject: [PATCH 01/12] fix for latest specs2-3.6.2 --- project/Build.scala | 13 +++---- .../github/athieriot/CleanAfterExample.scala | 33 +++++++++++++---- .../github/athieriot/EmbedConnection.scala | 32 +++++++++------- .../athieriot/CleanAfterExampleSpec.scala | 37 ++++++++++++------- .../athieriot/EmbedConnectionSpec.scala | 33 ++++++++++------- .../scala/com/github/athieriot/Model.scala | 11 ------ .../com/github/athieriot/MongoInit.scala | 16 ++++++++ 7 files changed, 108 insertions(+), 67 deletions(-) delete mode 100644 src/test/scala/com/github/athieriot/Model.scala create mode 100644 src/test/scala/com/github/athieriot/MongoInit.scala diff --git a/project/Build.scala b/project/Build.scala index 0120f0a..70cca48 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -3,14 +3,14 @@ import sbt.Keys._ object ProjectBuild extends Build { - lazy val buildVersion = "0.7.0" + lazy val buildVersion = "0.7.1" lazy val root = Project(id = "specs2-embedmongo", base = file("."), settings = Project.defaultSettings).settings( organization := "com.github.athieriot", description := "Specs2 helper to configure a EmbedMongo based instance", version := buildVersion, - scalaVersion := "2.10.4", - crossScalaVersions := Seq("2.10.4", "2.11.1"), + scalaVersion := "2.11.7", + crossScalaVersions := Seq("2.10.4", "2.11.7"), resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/", resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/", @@ -19,10 +19,9 @@ object ProjectBuild extends Build { resolvers += "Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases/", libraryDependencies <++= scalaVersion(sv => Seq( - "de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "1.46.0", - "org.specs2" %% "specs2" % "2.3.12", - "org.mongodb" %% "casbah-core" % "2.7.2" % "provided", - "com.novus" %% "salat-core" % "1.9.8" % "test", + "de.svenkubiak" % "embedded-mongodb" % "4.2.0", + "org.specs2" %% "specs2-core" % "3.6.2" % "provided", + "org.reactivemongo" %% "reactivemongo" % "0.11.2" % "provided", "junit" % "junit" % "4.11" % "test" )), diff --git a/src/main/scala/com/github/athieriot/CleanAfterExample.scala b/src/main/scala/com/github/athieriot/CleanAfterExample.scala index 56da6a1..30e8e72 100644 --- a/src/main/scala/com/github/athieriot/CleanAfterExample.scala +++ b/src/main/scala/com/github/athieriot/CleanAfterExample.scala @@ -1,16 +1,35 @@ package com.github.athieriot -import scala.collection.JavaConversions._ -import com.mongodb.{ MongoClient, ServerAddress } -import org.specs2.specification.AfterExample +import org.specs2.specification.AfterEach +import reactivemongo.api.MongoDriver +import reactivemongo.api.collections.bson._ +import scala.concurrent.Await +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.duration._ -trait CleanAfterExample extends AfterExample { +trait CleanAfterExample extends AfterEach { self: EmbedConnection => - lazy val mongoClient = new MongoClient(new ServerAddress(network.getServerAddress(), network.getPort())); + def getConn = { + val driver = new MongoDriver + val db = driver.connection(List(s"127.0.0.1:${network.getPort}"))("testdb") + println(s"XXXXXXXXXXXXXXXXXXXXXXXXxx 127.0.0.1:${network.getPort}") + Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) + db + } + + def after = { + println("XXXXXXXXXXXXXXXXXXXx in AFTER") + val conn = getConn + Await.ready(conn.drop(), 1 second) +// val colls = Await.result(conn.collectionNames, 2 seconds) +// println(s"XXXXXXXXXXXXXXX COLLS: ${colls}") - def after() { - mongoClient.getDatabaseNames().map { mongoClient.getDB(_) }.foreach { _.dropDatabase() } + Await.ready(conn.collectionNames.map(_.foreach{ + collection => + println(s"XXXXXXXX REMOVING $collection") + conn(collection).drop() + }), 5 second) } } \ No newline at end of file diff --git a/src/main/scala/com/github/athieriot/EmbedConnection.scala b/src/main/scala/com/github/athieriot/EmbedConnection.scala index b77208e..7e417ab 100644 --- a/src/main/scala/com/github/athieriot/EmbedConnection.scala +++ b/src/main/scala/com/github/athieriot/EmbedConnection.scala @@ -1,27 +1,28 @@ package com.github.athieriot -import de.flapdoodle.embed._ -import process.runtime.Network -import mongo._ -import config._ -import distribution._ -import org.specs2.specification._ -import org.specs2.mutable.SpecificationLike +import de.flapdoodle.embed.mongo._ +import de.flapdoodle.embed.mongo.config._ +import de.flapdoodle.embed.mongo.distribution._ +import de.flapdoodle.embed.process.runtime.Network import org.specs2.main.Arguments +import org.specs2.mutable.{Specification, SpecificationLike} +import org.specs2.specification.core.{Fragment, Fragments} -trait EmbedConnection extends FragmentsBuilder { +trait EmbedConnection extends Specification { self: SpecificationLike => isolated + def sequentialyIsolated: Arguments = args(isolated = true, sequential = true) + override def sequential: Arguments = args(isolated = false, sequential = true) override def isolated: Arguments = args(isolated = true, sequential = false) //Override this method to personalize testing port - def embedConnectionPort(): Int = { 12345 } + def embedConnectionPort: Int = 12345 //Override this method to personalize MongoDB version - def embedMongoDBVersion(): Version.Main = { Version.Main.PRODUCTION } + def embedMongoDBVersion: Version.Main = Version.Main.PRODUCTION lazy val network = new Net(embedConnectionPort, Network.localhostIsIPv6) @@ -36,11 +37,14 @@ trait EmbedConnection extends FragmentsBuilder { override def map(fs: => Fragments) = startMongo ^ fs ^ stoptMongo - private def startMongo() = { - Example("Start Mongo", { mongodExecutable.start; success }) + private def startMongo = { + println("XXXXXXXXXXXX STARTING MONGO") + + step(mongodExecutable.start) } - private def stoptMongo() = { - Example("Stop Mongo", { mongodExecutable.stop; success }) + private def stoptMongo = { + println("XXXXXXXXXXXX STOPING MONGO") + step(mongodExecutable.stop()) } } diff --git a/src/test/scala/com/github/athieriot/CleanAfterExampleSpec.scala b/src/test/scala/com/github/athieriot/CleanAfterExampleSpec.scala index fdf312a..67dfbc8 100644 --- a/src/test/scala/com/github/athieriot/CleanAfterExampleSpec.scala +++ b/src/test/scala/com/github/athieriot/CleanAfterExampleSpec.scala @@ -1,36 +1,45 @@ package com.github.athieriot -import org.junit.runner.RunWith -import org.specs2.runner.JUnitRunner import org.specs2.mutable.Specification +import reactivemongo.bson.BSONDocument -@RunWith(classOf[JUnitRunner]) -class CleanAfterExampleSpec extends Specification with EmbedConnection with CleanAfterExample { +import scala.concurrent.Await +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.duration._ + +class CleanAfterExampleSpec extends Specification with EmbedConnection with MongoInit with CleanAfterExample { + + sequentialyIsolated "Embed database" should { "be able to save a Model I" in { - Model.save(Model(name = "test")) - Model.count() must be_==(1) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(1) } "be able to save a Model II" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (1) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(1) } "be able to save a Model III" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (1) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(1) } "be able to save a Model IV" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (1) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(1) } "be able to save a Model V" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (1) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(1) } } } \ No newline at end of file diff --git a/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala b/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala index c9f0972..afd3399 100644 --- a/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala +++ b/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala @@ -1,37 +1,42 @@ package com.github.athieriot -import org.junit.runner.RunWith -import org.specs2.runner.JUnitRunner import org.specs2.mutable.Specification +import reactivemongo.bson.BSONDocument -@RunWith(classOf[JUnitRunner]) -class EmbedConnectionSpec extends Specification with EmbedConnection { +import scala.concurrent.Await +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.duration._ +class EmbedConnectionSpec extends Specification with EmbedConnection with MongoInit { sequential "Embed database" should { "be able to save a Model I" in { - Model.save(Model(name = "test")) - Model.count() must be_==(1) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(1) } "be able to save a Model II" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (2) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(2) } "be able to save a Model III" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (3) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(3) } "be able to save a Model IV" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (4) + val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) + Await.result(coll.count(None), 5 second) must be_==(4) } "be able to save a Model V" in { - Model.save(Model(name = "test")) - Model.count() must be be_== (5) + val coll = getColl + Await.result(coll.count(None), 5 second) must be_==(5) } } } diff --git a/src/test/scala/com/github/athieriot/Model.scala b/src/test/scala/com/github/athieriot/Model.scala deleted file mode 100644 index eb6f912..0000000 --- a/src/test/scala/com/github/athieriot/Model.scala +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.athieriot - -import com.mongodb.casbah.Imports._ -import org.bson.types.ObjectId -import com.novus.salat.global._ -import com.novus.salat._ -import com.novus.salat.dao._ - -case class Model(id: ObjectId = new ObjectId, name: String) - -object Model extends SalatDAO[Model, ObjectId](collection = MongoConnection("localhost", 12345)("test")("model")) {} \ No newline at end of file diff --git a/src/test/scala/com/github/athieriot/MongoInit.scala b/src/test/scala/com/github/athieriot/MongoInit.scala new file mode 100644 index 0000000..e674ca0 --- /dev/null +++ b/src/test/scala/com/github/athieriot/MongoInit.scala @@ -0,0 +1,16 @@ +package com.github.athieriot + +import reactivemongo.api.MongoDriver +import reactivemongo.api.collections.bson.BSONCollection +import scala.concurrent.Await +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.duration._ + +trait MongoInit { + def getColl: BSONCollection = { + val driver = new MongoDriver + val db = driver.connection(List("localhost:12345"))("testdb") + Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) + db("testcoll") + } +} From 404efb1574758420fbcb0da4946333a7271c7f90 Mon Sep 17 00:00:00 2001 From: Maris Ruskulis Date: Thu, 16 Jul 2015 15:05:43 +0300 Subject: [PATCH 02/12] fix for latest specs2-3.6.2 --- src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala b/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala index afd3399..4aabd33 100644 --- a/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala +++ b/src/test/scala/com/github/athieriot/EmbedConnectionSpec.scala @@ -36,6 +36,7 @@ class EmbedConnectionSpec extends Specification with EmbedConnection with MongoI "be able to save a Model V" in { val coll = getColl + Await.ready(coll.insert(BSONDocument("hello" -> "World")), 1 second) Await.result(coll.count(None), 5 second) must be_==(5) } } From 5350b20f2874d21de75f743ab6a7686efaec97c1 Mon Sep 17 00:00:00 2001 From: Maris Ruskulis Date: Thu, 16 Jul 2015 15:07:44 +0300 Subject: [PATCH 03/12] cleanup debug --- .../com/github/athieriot/CleanAfterExample.scala | 14 ++------------ .../com/github/athieriot/EmbedConnection.scala | 3 --- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/scala/com/github/athieriot/CleanAfterExample.scala b/src/main/scala/com/github/athieriot/CleanAfterExample.scala index 30e8e72..fbad0cb 100644 --- a/src/main/scala/com/github/athieriot/CleanAfterExample.scala +++ b/src/main/scala/com/github/athieriot/CleanAfterExample.scala @@ -2,7 +2,7 @@ package com.github.athieriot import org.specs2.specification.AfterEach import reactivemongo.api.MongoDriver -import reactivemongo.api.collections.bson._ + import scala.concurrent.Await import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ @@ -19,17 +19,7 @@ trait CleanAfterExample extends AfterEach { } def after = { - println("XXXXXXXXXXXXXXXXXXXx in AFTER") - val conn = getConn - Await.ready(conn.drop(), 1 second) -// val colls = Await.result(conn.collectionNames, 2 seconds) -// println(s"XXXXXXXXXXXXXXX COLLS: ${colls}") - - Await.ready(conn.collectionNames.map(_.foreach{ - collection => - println(s"XXXXXXXX REMOVING $collection") - conn(collection).drop() - }), 5 second) + Await.ready(getConn.drop(), 1 second) } } \ No newline at end of file diff --git a/src/main/scala/com/github/athieriot/EmbedConnection.scala b/src/main/scala/com/github/athieriot/EmbedConnection.scala index 7e417ab..422c8d6 100644 --- a/src/main/scala/com/github/athieriot/EmbedConnection.scala +++ b/src/main/scala/com/github/athieriot/EmbedConnection.scala @@ -38,13 +38,10 @@ trait EmbedConnection extends Specification { override def map(fs: => Fragments) = startMongo ^ fs ^ stoptMongo private def startMongo = { - println("XXXXXXXXXXXX STARTING MONGO") - step(mongodExecutable.start) } private def stoptMongo = { - println("XXXXXXXXXXXX STOPING MONGO") step(mongodExecutable.stop()) } } From 358801b7a27f0e8ee50c736c479ecaa9abc24c48 Mon Sep 17 00:00:00 2001 From: Maris Ruskulis Date: Mon, 20 Jul 2015 15:06:59 +0300 Subject: [PATCH 04/12] remove debug --- src/main/scala/com/github/athieriot/CleanAfterExample.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scala/com/github/athieriot/CleanAfterExample.scala b/src/main/scala/com/github/athieriot/CleanAfterExample.scala index fbad0cb..c833683 100644 --- a/src/main/scala/com/github/athieriot/CleanAfterExample.scala +++ b/src/main/scala/com/github/athieriot/CleanAfterExample.scala @@ -13,7 +13,6 @@ trait CleanAfterExample extends AfterEach { def getConn = { val driver = new MongoDriver val db = driver.connection(List(s"127.0.0.1:${network.getPort}"))("testdb") - println(s"XXXXXXXXXXXXXXXXXXXXXXXXxx 127.0.0.1:${network.getPort}") Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) db } From 867816dbbf262d05950b28b806dbbedea079c370 Mon Sep 17 00:00:00 2001 From: Maris Ruskulis Date: Mon, 17 Aug 2015 11:40:48 +0300 Subject: [PATCH 05/12] bump sbt version --- README.md | 2 +- project/Build.scala | 11 +++-------- project/build.properties | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 2232b5e..3a9c1fa 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ You can change thow default values: Modify `project/Build.scala` and add -`"com.github.athieriot" %% "specs2-embedmongo" % "0.7.0"` +`"com.github.athieriot" %% "specs2-embedmongo" % "0.8.0"` [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/athieriot/specs2-embedmongo/trend.png)](https://bitdeli.com/free "Bitdeli Badge") diff --git a/project/Build.scala b/project/Build.scala index 70cca48..f9ef735 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -3,7 +3,7 @@ import sbt.Keys._ object ProjectBuild extends Build { - lazy val buildVersion = "0.7.1" + lazy val buildVersion = "0.8.0" lazy val root = Project(id = "specs2-embedmongo", base = file("."), settings = Project.defaultSettings).settings( organization := "com.github.athieriot", @@ -51,12 +51,7 @@ object ProjectBuild extends Build { ), - publishTo <<= version { version: String => - val nexus = "https://oss.sonatype.org/" - if (version.trim.endsWith("SNAPSHOT")) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - } + publishTo := Some("cody" at "http://cody:8082/nexus/content/repositories/releases"), + credentials += Credentials(Path.userHome / ".sbt" / "sonatype.credentials") ) } diff --git a/project/build.properties b/project/build.properties index 0974fce..a6e117b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.0 +sbt.version=0.13.8 From c021cc0583a573b62373b68cc541bd97e288dd75 Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 20:29:54 +0200 Subject: [PATCH 06/12] deleteme added --- DELETEME | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 DELETEME diff --git a/DELETEME b/DELETEME new file mode 100644 index 0000000..e69de29 From e89cf3e179b0fe8f3ca2be691ea5ba8eaf2da4ef Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 20:45:16 +0200 Subject: [PATCH 07/12] deps updated --- project/Build.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index f9ef735..bab1312 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -3,7 +3,7 @@ import sbt.Keys._ object ProjectBuild extends Build { - lazy val buildVersion = "0.8.0" + lazy val buildVersion = "0.8.1" lazy val root = Project(id = "specs2-embedmongo", base = file("."), settings = Project.defaultSettings).settings( organization := "com.github.athieriot", @@ -19,10 +19,10 @@ object ProjectBuild extends Build { resolvers += "Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases/", libraryDependencies <++= scalaVersion(sv => Seq( - "de.svenkubiak" % "embedded-mongodb" % "4.2.0", - "org.specs2" %% "specs2-core" % "3.6.2" % "provided", - "org.reactivemongo" %% "reactivemongo" % "0.11.2" % "provided", - "junit" % "junit" % "4.11" % "test" + "de.svenkubiak" % "embedded-mongodb" % "4.2.9", + "org.specs2" %% "specs2-core" % "3.8.3" % "provided", + "org.reactivemongo" %% "reactivemongo" % "0.11.11" % "provided", + "junit" % "junit" % "4.12" % "test" )), parallelExecution in Test := false, From d433cfd3dd79fa90e5d11ccb5956843e82bb3782 Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 20:53:01 +0200 Subject: [PATCH 08/12] travis changed version of scala 2.11 and specs2 version changed to 3.8.2 --- .travis.yml | 2 +- project/Build.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18d67b5..655de81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: scala scala: - "2.10.4" - - "2.11.1" + - "2.11.7" diff --git a/project/Build.scala b/project/Build.scala index bab1312..4285211 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -20,7 +20,7 @@ object ProjectBuild extends Build { libraryDependencies <++= scalaVersion(sv => Seq( "de.svenkubiak" % "embedded-mongodb" % "4.2.9", - "org.specs2" %% "specs2-core" % "3.8.3" % "provided", + "org.specs2" %% "specs2-core" % "3.8.2" % "provided", "org.reactivemongo" %% "reactivemongo" % "0.11.11" % "provided", "junit" % "junit" % "4.12" % "test" )), From 665a723a9d29f3eb0ad02dfb06f872884fc06c04 Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 21:06:15 +0200 Subject: [PATCH 09/12] wait for primary removed --- src/main/scala/com/github/athieriot/CleanAfterExample.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/github/athieriot/CleanAfterExample.scala b/src/main/scala/com/github/athieriot/CleanAfterExample.scala index c833683..20720fc 100644 --- a/src/main/scala/com/github/athieriot/CleanAfterExample.scala +++ b/src/main/scala/com/github/athieriot/CleanAfterExample.scala @@ -13,7 +13,7 @@ trait CleanAfterExample extends AfterEach { def getConn = { val driver = new MongoDriver val db = driver.connection(List(s"127.0.0.1:${network.getPort}"))("testdb") - Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) + //Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) db } From 208e26f7d038545000d00064ccc5b7a5c2a4ea8f Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 21:20:18 +0200 Subject: [PATCH 10/12] reverted reactive mongo version --- project/Build.scala | 2 +- src/main/scala/com/github/athieriot/CleanAfterExample.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 4285211..60516bd 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -21,7 +21,7 @@ object ProjectBuild extends Build { libraryDependencies <++= scalaVersion(sv => Seq( "de.svenkubiak" % "embedded-mongodb" % "4.2.9", "org.specs2" %% "specs2-core" % "3.8.2" % "provided", - "org.reactivemongo" %% "reactivemongo" % "0.11.11" % "provided", + "org.reactivemongo" %% "reactivemongo" % "0.11.2" % "provided", "junit" % "junit" % "4.12" % "test" )), diff --git a/src/main/scala/com/github/athieriot/CleanAfterExample.scala b/src/main/scala/com/github/athieriot/CleanAfterExample.scala index 20720fc..c833683 100644 --- a/src/main/scala/com/github/athieriot/CleanAfterExample.scala +++ b/src/main/scala/com/github/athieriot/CleanAfterExample.scala @@ -13,7 +13,7 @@ trait CleanAfterExample extends AfterEach { def getConn = { val driver = new MongoDriver val db = driver.connection(List(s"127.0.0.1:${network.getPort}"))("testdb") - //Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) + Await.ready(db.connection.waitForPrimary(10 seconds), 11 seconds) db } From e68319a80b85267f66d8fdafa46136d25b3c4db7 Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 21:24:05 +0200 Subject: [PATCH 11/12] reactive mongo version 0.11.8 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 60516bd..c238e73 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -21,7 +21,7 @@ object ProjectBuild extends Build { libraryDependencies <++= scalaVersion(sv => Seq( "de.svenkubiak" % "embedded-mongodb" % "4.2.9", "org.specs2" %% "specs2-core" % "3.8.2" % "provided", - "org.reactivemongo" %% "reactivemongo" % "0.11.2" % "provided", + "org.reactivemongo" %% "reactivemongo" % "0.11.8" % "provided", "junit" % "junit" % "4.12" % "test" )), From 8321dc9b18f1123d152d7784375f50ca4d85f7f4 Mon Sep 17 00:00:00 2001 From: mtraina Date: Wed, 18 May 2016 21:27:35 +0200 Subject: [PATCH 12/12] finalization --- DELETEME | 0 README.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 DELETEME diff --git a/DELETEME b/DELETEME deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md index 3a9c1fa..20c931d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ You can change thow default values: Modify `project/Build.scala` and add -`"com.github.athieriot" %% "specs2-embedmongo" % "0.8.0"` +`"com.github.athieriot" %% "specs2-embedmongo" % "0.8.1"` [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/athieriot/specs2-embedmongo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")