Upgrade to Specs2 1.6-SNAPSHOT

9 files changed, 19 insertions, 11 deletions

diff --git a/project/build/Project.scala b/project/build/Project.scala
index 3effd88..6a100fe 100644
--- a/project/build/Project.scala
+++ b/project/build/Project.scala
@@ -18,14 +18,22 @@ class Project(info: ProjectInfo) extends DefaultProject(info) with posterous.Pub
   // -------------------------------------------------------------------------------------------------------------------
   import Repositories._
 
+  val snapshots = "snapshots" at "http://scala-tools.org/repo-snapshots"
+
   // -------------------------------------------------------------------------------------------------------------------
   // Dependencies
   // -------------------------------------------------------------------------------------------------------------------
   val parboiledC = "org.parboiled" % "parboiled-core" % "1.0.1" % "compile" withSources()
   val parboiledS = "org.parboiled" % "parboiled-scala" % "1.0.1" % "compile" withSources()
-  
-  val specs = "org.scala-tools.testing" %% "specs" % "1.6.8" % "test" withSources()
-  
+
+  // -------------------------------------------------------------------------------------------------------------------
+  // Testing with Specs2
+  // -------------------------------------------------------------------------------------------------------------------
+  val specs2 = "org.specs2" %% "specs2" % "1.6-SNAPSHOT" % "test" withSources()
+
+  def specs2Framework = new TestFramework("org.specs2.runner.SpecsFramework")
+  override def testFrameworks = super.testFrameworks ++ Seq(specs2Framework)
+
   // -------------------------------------------------------------------------------------------------------------------
   // Options
   // -------------------------------------------------------------------------------------------------------------------
diff --git a/src/test/scala/cc/spray/json/BasicFormatsSpec.scala b/src/test/scala/cc/spray/json/BasicFormatsSpec.scala
index c26d302..fcae4bb 100644
--- a/src/test/scala/cc/spray/json/BasicFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/BasicFormatsSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 
 class BasicFormatsSpec extends Specification with DefaultJsonProtocol {
 
diff --git a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala
index 126b96a..d0cb509 100644
--- a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 import java.util.Arrays
 
 class CollectionFormatsSpec extends Specification with DefaultJsonProtocol {
diff --git a/src/test/scala/cc/spray/json/CompactPrinterSpec.scala b/src/test/scala/cc/spray/json/CompactPrinterSpec.scala
index 4ca4aac..3bc4870 100644
--- a/src/test/scala/cc/spray/json/CompactPrinterSpec.scala
+++ b/src/test/scala/cc/spray/json/CompactPrinterSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 
 class CompactPrinterSpec extends Specification {
 
diff --git a/src/test/scala/cc/spray/json/JsonParserSpec.scala b/src/test/scala/cc/spray/json/JsonParserSpec.scala
index 6402b3d..0860d05 100644
--- a/src/test/scala/cc/spray/json/JsonParserSpec.scala
+++ b/src/test/scala/cc/spray/json/JsonParserSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 import org.parboiled.common.FileUtils
 
 class JsonParserSpec extends Specification {
diff --git a/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala b/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala
index 541abc9..feed8a9 100644
--- a/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala
+++ b/src/test/scala/cc/spray/json/PrettyPrinterSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 
 class PrettyPrinterSpec extends Specification {
 
diff --git a/src/test/scala/cc/spray/json/ProductFormatsSpec.scala b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala
index 5f253c2..09b188e 100644
--- a/src/test/scala/cc/spray/json/ProductFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 
 class ProductFormatsSpec extends Specification with DefaultJsonProtocol {
 
diff --git a/src/test/scala/cc/spray/json/ReadmeSpec.scala b/src/test/scala/cc/spray/json/ReadmeSpec.scala
index 8669c0d..843d1fc 100644
--- a/src/test/scala/cc/spray/json/ReadmeSpec.scala
+++ b/src/test/scala/cc/spray/json/ReadmeSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 
 class ReadmeSpec extends Specification {
 
diff --git a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
index 8005c9f..ad9485c 100644
--- a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
@@ -1,6 +1,6 @@
 package cc.spray.json
 
-import org.specs.Specification
+import org.specs2.mutable._
 import scala.Right
 
 class StandardFormatsSpec extends Specification with DefaultJsonProtocol {