diff options
author | Vadim Chelyshov <qtankle@gmail.com> | 2018-01-05 16:34:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 16:34:23 +0300 |
commit | c5271eeb2492136a2dd70e4bdad948fb4976e580 (patch) | |
tree | 320acca2ce766c08b15830ea35244a313f71e52f | |
parent | 3dc21f66bd0d4a6dce1ab110e9a7240a22a8c198 (diff) | |
download | mill-c5271eeb2492136a2dd70e4bdad948fb4976e580.tar.gz mill-c5271eeb2492136a2dd70e4bdad948fb4976e580.tar.bz2 mill-c5271eeb2492136a2dd70e4bdad948fb4976e580.zip |
Fix scalatest support (#101)
* Fix #99 - it's required to provide sbt.testing.Selector for scalatest
3 files changed, 6 insertions, 1 deletions
diff --git a/integration/src/test/scala/mill/integration/BetterFilesTests.scala b/integration/src/test/scala/mill/integration/BetterFilesTests.scala index 1fcb007f..82b66fba 100644 --- a/integration/src/test/scala/mill/integration/BetterFilesTests.scala +++ b/integration/src/test/scala/mill/integration/BetterFilesTests.scala @@ -11,6 +11,10 @@ object BetterFilesTests extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "b assert(eval("core.test")) assert(eval("akka.test")) + val coreTestMeta = meta("Core.test.test") + assert(coreTestMeta.contains("better.files.FileSpec")) + assert(coreTestMeta.contains("files should handle BOM")) + for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){ write.append(scalaFile, "\n}") } diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala index 01e73ad5..e940d275 100644 --- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala +++ b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala @@ -15,6 +15,7 @@ abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) exte stdOutErr, stdOutErr, stdIn, stdOutErr, stdOutErr ) def eval(s: String*) = runner.runScript(workspacePath / "build.sc", s.toList) + def meta(s: String) = read(workspacePath / "out" / RelPath(s.replaceAll("\\.", "/")) / "meta.json") def initWorkspace() = { rm(workspacePath) mkdir(workspacePath / up) diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala index 304ae989..ef2c3a50 100644 --- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala +++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala @@ -99,7 +99,7 @@ object TestRunner { val tasks = runner.tasks( for ((cls, fingerprint) <- testClasses.toArray) - yield new TaskDef(cls.getName.stripSuffix("$"), fingerprint, true, Array()) + yield new TaskDef(cls.getName.stripSuffix("$"), fingerprint, true, Array(new SuiteSelector)) ) val events = mutable.Buffer.empty[Event] for (t <- tasks) { |