diff --git a/framework/project/Build.scala b/framework/project/Build.scala index 969ceae53c0..99076593ab7 100644 --- a/framework/project/Build.scala +++ b/framework/project/Build.scala @@ -508,7 +508,7 @@ object PlayBuild extends Build { specsBuild % "test", "org.mockito" % "mockito-all" % "1.9.0" % "test", - "com.novocode" % "junit-interface" % "0.10-M2" % "test", + "com.novocode" % "junit-interface" % "0.9" % "test", "org.fluentlenium" % "fluentlenium-festassert" % "0.7.3" % "test" exclude("org.jboss.netty", "netty"), "org.scala-lang" % "scala-reflect" % "2.10.0" @@ -581,7 +581,7 @@ object PlayBuild extends Build { val testDependencies = Seq( "junit" % "junit-dep" % "4.10", specsBuild, - "com.novocode" % "junit-interface" % "0.10-M2", + "com.novocode" % "junit-interface" % "0.9", "org.fluentlenium" % "fluentlenium-festassert" % "0.7.3" exclude("org.jboss.netty", "netty") ) diff --git a/framework/src/sbt-plugin/src/main/scala/PlaySettings.scala b/framework/src/sbt-plugin/src/main/scala/PlaySettings.scala index 853b83d7e0e..b50bf9ff8d6 100644 --- a/framework/src/sbt-plugin/src/main/scala/PlaySettings.scala +++ b/framework/src/sbt-plugin/src/main/scala/PlaySettings.scala @@ -111,7 +111,7 @@ trait PlaySettings { testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential", "true"), - testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "junitxml", "console", "--ignore-runners=org.specs2.runner.JUnitRunner"), + testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "junitxml", "console"), testListeners <<= (target, streams).map((t, s) => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath, s.log))), diff --git a/framework/test/integrationtest-scala/test/RunWithSpec.scala b/framework/test/integrationtest-scala/test/RunWithSpec.scala deleted file mode 100644 index b99ead3e632..00000000000 --- a/framework/test/integrationtest-scala/test/RunWithSpec.scala +++ /dev/null @@ -1,26 +0,0 @@ -package test -import org.specs2.mutable._ - -import org.junit.runner._ -import org.specs2.runner.JUnitRunner -import org.specs2.specification.Scope -import play.api.libs.Files._ - -@RunWith(classOf[JUnitRunner]) -class RunWithSpec extends Specification { - - class ScopeVar extends Scope { - RunWithSpecVar.count += 1 - } - - "Specs with runWith" should { - "execute once" in new ScopeVar { - RunWithSpecVar.count === 1 - } - } -} - -object RunWithSpecVar { - var count = 0 -} -