Merge branch 'master' of github.com:keenlabs/KeenClient-Scala

keenlabs · Jan 23, 2015 · 88fd338 · 88fd338
2 parents e7d6f87 + a8fe342
commit 88fd338
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: scala
+scala:
+  - 2.11.2
+  - 2.10.4
+jdk:
+  - oraclejdk7
+  - openjdk7
+
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # KeenClient-Scala
 
+[![Build Status]](https://travis-ci.org/keenlabs/KeenClient-Scala)
+
 The official asynchronous Scala client for the [Keen IO] API.
 
 **Note**: This library is in early development and does not implement all of the
@@ -145,16 +147,19 @@ adapters with optional deps.
 
 ## Hack On It
 
+Unit tests can be run with the standard SBT commands `test`, `testQuick`, etc.
+
 The test suite includes integration tests which require keys and access to Keen
-IO's API. You can skip them in the SBT console with:
+IO's API. If you have set keys through environment variables or configuration as
+described above, you may run these with:
 
-```
-> testOnly * -- exclude integration
-```
+    $ sbt it:test
 
-Unit tests can be run with the standard SBT `test`, `testQuick`, etc.
+**Only use a dedicated dummy account for this purpose, data could be destroyed
+that you didn't expect!**
 
 
+[Build Status]: https://travis-ci.org/keenlabs/KeenClient-Scala.svg?branch=master
 [Keen IO]: http://keen.io/
 [Semantic Versioning]: http://semver.org/
 [the changelog]: https://github.com/keenlabs/KeenClient-Scala/blob/master/CHANGELOG

diff --git a/build.sbt b/build.sbt
@@ -30,8 +30,8 @@ libraryDependencies ++= {
     "io.spray"                 %% "spray-util"      % sprayVersion,
     "net.databinder.dispatch"  %% "dispatch-core"   % "0.11.2",
     "org.clapper"              %% "grizzled-slf4j"  % "1.0.2",
-    "org.specs2"               %% "specs2"          % "2.4.13"       % "test",
-    "org.slf4j"                %  "slf4j-simple"    % "1.7.6"        % "test"
+    "org.specs2"               %% "specs2"          % "2.4.13"       % "it,test",
+    "org.slf4j"                %  "slf4j-simple"    % "1.7.6"        % "it,test"
   )
 }
 
@@ -41,3 +41,7 @@ initialCommands in console := "import io.keen.client.scala._"
 // ...but skip it in case we've broken the build and want the REPL to find out why!
 initialCommands in consoleQuick := ""
 
+// SBT support for Maven-style integration tests (src/it)
+Defaults.itSettings
+configs(IntegrationTest)
+
diff --git a/src/test/resources/application.conf → src/it/resources/application.conf b/src/test/resources/application.conf → src/it/resources/application.conf
diff --git a/src/test/scala/ClientIntegrationSpec.scala → src/it/scala/ClientIntegrationSpec.scala b/src/test/scala/ClientIntegrationSpec.scala → src/it/scala/ClientIntegrationSpec.scala
@@ -14,8 +14,6 @@ class ClientIntegrationSpec extends Specification with NoTimeConversions {
   // slow--see IntegrationPatience in ScalaTest, not sure if specs2 has similar...
   val timeout = 4.seconds
 
-  // args(exclude = "integration")
-
   sequential
 
   // This set of expectations currently assumes master access. Should
@@ -175,5 +173,5 @@ class ClientIntegrationSpec extends Specification with NoTimeConversions {
       client.shutdown()
       1 must beEqualTo(1)
     }
-  } section("integration")
+  }
 }