Skip to content
Browse files

Fix specs2 base trait infrastructure

  • Loading branch information...
1 parent 6a09d35 commit 207e8fd4b370816640b4249dde1483f9a22c132a @casualjim casualjim committed Mar 22, 2013
View
2 project/build.scala
@@ -345,7 +345,7 @@ object ScalatraBuild extends Build {
private val specs2Version: String => String = {
case sv if sv startsWith "2.8." => "1.5"
case "2.9.0-1" => "1.8.2"
- case sv if sv startsWith "2.9." => "1.12.3"
+ case sv if sv startsWith "2.9." => "1.12.4.1"
case _ => "1.14"
}
View
5 specs2/src/main/scala/org/scalatra/test/specs2/BaseScalatraSpec.scala
@@ -2,13 +2,14 @@ package org.scalatra
package test
package specs2
-import org.specs2.specification.{BaseSpecification, Step, Fragments}
+import org.specs2.specification.{SpecificationStructure, BaseSpecification, Step, Fragments}
+import org.specs2.mutable.FragmentsBuilder
/**
* A base specification structure that starts the tester before the
* specification and stops it afterward. Clients probably want to extend
* ScalatraSpec or MutableScalatraSpec.
*/
-trait BaseScalatraSpec extends BaseSpecification with ScalatraTests {
+trait BaseScalatraSpec extends SpecificationStructure with FragmentsBuilder with ScalatraTests {
override def map(fs: =>Fragments) = Step(start()) ^ super.map(fs) ^ Step(stop())
}
View
4 specs2/src/main/scala/org/scalatra/test/specs2/MutableScalatraSpec.scala
@@ -2,7 +2,7 @@ package org.scalatra
package test
package specs2
-import org.specs2.mutable.Specification
+import org.specs2.mutable.SpecificationLike
/**
* A Specification that starts the tester before the specification and stops it
@@ -11,4 +11,4 @@ import org.specs2.mutable.Specification
* This is a spec of the mutable variation of the specs2 framework.
* All documentation for specs2 still applies.
*/
-trait MutableScalatraSpec extends Specification with BaseScalatraSpec
+trait MutableScalatraSpec extends SpecificationLike with BaseScalatraSpec
View
4 specs2/src/main/scala/org/scalatra/test/specs2/ScalatraSpec.scala
@@ -2,7 +2,7 @@ package org.scalatra
package test
package specs2
-import org.specs2.Specification
+import org.specs2.SpecificationLike
/**
* A Specification that starts the tester before the specification and stops it
@@ -11,4 +11,4 @@ import org.specs2.Specification
* This is a spec of the immutable variation of the specs2 framework.
* All documentation for specs2 still applies.
*/
-trait ScalatraSpec extends Specification with BaseScalatraSpec
+trait ScalatraSpec extends SpecificationLike with BaseScalatraSpec

0 comments on commit 207e8fd

Please sign in to comment.
Something went wrong with that request. Please try again.