allow travis ci tests to run

foursquare · Aug 2, 2013 · da0c647 · da0c647
1 parent 38eb91c
commit da0c647
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,11 @@
 language: scala
+
 scala:
  - 2.9.2
  - 2.10.2
+
+services:
+ - mongodb
+
+env:
+ - MONGO_PORT=27017
diff --git a/rogue-core/src/test/scala/com/foursquare/rogue/TrivialORMQueryTest.scala b/rogue-core/src/test/scala/com/foursquare/rogue/TrivialORMQueryTest.scala
@@ -17,7 +17,7 @@ object TrivialORM {
   }
 
   val mongo = {
-    val MongoPort = 37648
+    val MongoPort = Option(System.getenv("MONGO_PORT")).map(_.toInt).getOrElse(37648)
     new Mongo(new ServerAddress("localhost", MongoPort))
   }
 

diff --git a/rogue-lift/src/test/scala/com/foursquare/rogue/TestModels.scala b/rogue-lift/src/test/scala/com/foursquare/rogue/TestModels.scala
@@ -16,12 +16,13 @@ import org.bson.types.ObjectId
 /////////////////////////////////////////////////
 
 object RogueTestMongo extends MongoIdentifier {
+
   override def jndiName = "rogue_mongo"
 
   private var mongo: Option[Mongo] = None
 
   def connectToMongo = {
-    val MongoPort = 37648
+    val MongoPort = Option(System.getenv("MONGO_PORT")).map(_.toInt).getOrElse(37648)
     mongo = Some(new Mongo(new ServerAddress("localhost", MongoPort)))
     MongoDB.defineDb(RogueTestMongo, mongo.get, "rogue-test")
   }