Merge pull request playframework#714 from nraychaudhuri/967_fix_junit…

…_tests 967 fix junit tests
couhajjou · Jan 30, 2013 · f08a441 · f08a441
2 parents e8cd9ba + af2de7c
commit f08a441
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git 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
@@ -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