luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix integration test group 'tests'

This commit is contained in:
Mark Harrah 2012-01-22 22:06:53 -05:00
parent 30cca3a6d0
commit 048d5157c7
13 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbt/src/sbt-test/tests/arguments/build.sbt
View File

@ -1,4 +1,5 @@
libraryDependencies += "org.scalatest" % "scalatest" % "1.3"
libraryDependencies += "org.scalatest" %% "scalatest" % "1.6.1" % "test"
testOptions in Configurations.Test ++= {
def args(path: String, args: String*): Seq[TestOption] = if(file(path).exists) Tests.Argument(args : _*) :: Nil else Nil

2
sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

2
sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

2
sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

2
sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

7
sbt/src/sbt-test/tests/it/project/B.scala
View File

@ -6,8 +6,11 @@ object B extends Build
lazy val root =
Project("root", file("."))
.configs( IntegrationTest )
.settings( libraryDependencies += specs )
.settings( Defaults.itSettings : _*)
.settings(
libraryDependencies += specs,
resolvers += ScalaToolsReleases
)
lazy val specs = "org.scala-tools.testing" %% "specs" % "1.6.7.2" % "it,test" intransitive()
lazy val specs = "org.specs2" %% "specs2" % "1.7.1" % "it,test"
}

4
sbt/src/sbt-test/tests/resources/build.sbt
View File

@ -1 +1,3 @@
libraryDependencies += "org.scala-tools.testing" %% "specs" % "1.6.7.2" intransitive()
libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test"
resolvers += ScalaToolsReleases

6
sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala
View File

@ -1,11 +1,11 @@
import org.specs._
import org.specs2.mutable._
object BasicTest extends Specification
{
"Test resource on test classpath" in {
getClass.getResource("TestResource.txt") mustNotBe null
getClass.getResource("TestResource.txt") must not beNull
}
"Main resource on test classpath" in {
getClass.getResource("MainResource.txt") mustNotBe null
getClass.getResource("MainResource.txt") must not beNull
}
}

4
sbt/src/sbt-test/tests/specs-run/build.sbt
View File

@ -1 +1,3 @@
libraryDependencies += "org.scala-tools.testing" %% "specs" % "1.6.7.2" intransitive()
libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test"
resolvers += ScalaToolsReleases

2
sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

2
sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

2
sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{

2
sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
View File

@ -1,4 +1,4 @@
import org.specs._
import org.specs2.mutable._
class B extends Specification
{