add specs2 to list of known test frameworks

scala-ide · May 29, 2011 · 7d08bfe · 7d08bfe
1 parent fcddde0
commit 7d08bfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/main/Defaults.scala b/main/Defaults.scala
@@ -223,7 +223,7 @@ object Defaults extends BuildCommon
 		testLoader <<= (fullClasspath, scalaInstance) map { (cp, si) => TestFramework.createTestLoader(data(cp), si) },
 		testFrameworks in GlobalScope :== {
 			import sbt.TestFrameworks._
-			Seq(ScalaCheck, Specs, ScalaTest, ScalaCheckCompat, ScalaTestCompat, SpecsCompat, JUnit)
+			Seq(ScalaCheck, Specs2, Specs, ScalaTest, ScalaCheckCompat, ScalaTestCompat, SpecsCompat, JUnit)
 		},
 		loadedTestFrameworks <<= (testFrameworks, streams, testLoader) map { (frameworks, s, loader) =>
 			frameworks.flatMap(f => f.create(loader, s.log).map( x => (f,x)).toIterable).toMap

diff --git a/testing/TestFramework.scala b/testing/TestFramework.scala
@@ -19,6 +19,7 @@ object TestFrameworks
 	val ScalaCheck = new TestFramework("org.scalacheck.ScalaCheckFramework")
 	val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework")
 	val Specs = new TestFramework("org.specs.runner.SpecsFramework")
+	val Specs2 = new TestFramework("org.specs2.runner.SpecsFramework")
 	val JUnit = new TestFramework("com.novocode.junit.JUnitFramework")
 	// These are compatibility frameworks included in the 'test-compat' library
 	val ScalaCheckCompat = new TestFramework("sbt.impl.ScalaCheckFramework")