diff --git a/sbt/src/sbt-test/tests/arguments/build.sbt b/sbt/src/sbt-test/tests/arguments/build.sbt index 5ec40bea1..027d01f03 100644 --- a/sbt/src/sbt-test/tests/arguments/build.sbt +++ b/sbt/src/sbt-test/tests/arguments/build.sbt @@ -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 diff --git a/sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala b/sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala index 9edb63d32..167d25100 100644 --- a/sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala +++ b/sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala b/sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala index c82a24321..47d17d531 100644 --- a/sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala +++ b/sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala b/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala index 97f8da28b..7d1fc3ae6 100644 --- a/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala +++ b/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala b/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala index 04302ad2c..353ebbdca 100644 --- a/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala +++ b/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/it/project/B.scala b/sbt/src/sbt-test/tests/it/project/B.scala index e576dbe8f..88fca7dce 100644 --- a/sbt/src/sbt-test/tests/it/project/B.scala +++ b/sbt/src/sbt-test/tests/it/project/B.scala @@ -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" } \ No newline at end of file diff --git a/sbt/src/sbt-test/tests/resources/build.sbt b/sbt/src/sbt-test/tests/resources/build.sbt index c05ea491e..c2642043e 100644 --- a/sbt/src/sbt-test/tests/resources/build.sbt +++ b/sbt/src/sbt-test/tests/resources/build.sbt @@ -1 +1,3 @@ -libraryDependencies += "org.scala-tools.testing" %% "specs" % "1.6.7.2" intransitive() \ No newline at end of file +libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test" + +resolvers += ScalaToolsReleases \ No newline at end of file diff --git a/sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala b/sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala index 9d2540347..9956f1905 100644 --- a/sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala +++ b/sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala @@ -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 } } \ No newline at end of file diff --git a/sbt/src/sbt-test/tests/specs-run/build.sbt b/sbt/src/sbt-test/tests/specs-run/build.sbt index 1223cc386..8f2e4cc56 100644 --- a/sbt/src/sbt-test/tests/specs-run/build.sbt +++ b/sbt/src/sbt-test/tests/specs-run/build.sbt @@ -1 +1,3 @@ -libraryDependencies += "org.scala-tools.testing" %% "specs" % "1.6.7.2" intransitive() +libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test" + +resolvers += ScalaToolsReleases diff --git a/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala index 7004fd0bf..9b708ef50 100644 --- a/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala +++ b/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala index 3a54eca86..814bd6cc1 100644 --- a/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala +++ b/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala index 97f8da28b..7d1fc3ae6 100644 --- a/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala +++ b/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification { diff --git a/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala index 04302ad2c..353ebbdca 100644 --- a/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala +++ b/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala @@ -1,4 +1,4 @@ -import org.specs._ +import org.specs2.mutable._ class B extends Specification {