diff options
| author | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2018-02-22 11:18:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 11:18:45 +0300 |
| commit | 2cbc8d403715bc909325c9323ef58ffb47b22e1f (patch) | |
| tree | 3cebde274f4f31a643e6d9c9d728b01d83649130 /scalajslib | |
| parent | 107ba88754673e08b030b9ba1c8f4e6f1eefd13d (diff) | |
| download | mill-2cbc8d403715bc909325c9323ef58ffb47b22e1f.tar.gz mill-2cbc8d403715bc909325c9323ef58ffb47b22e1f.tar.bz2 mill-2cbc8d403715bc909325c9323ef58ffb47b22e1f.zip | |
support multiple test frameworks (#148)
support multiple test frameworks
Diffstat (limited to 'scalajslib')
| -rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 4 | ||||
| -rw-r--r-- | scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index a94b287d..ab67cd95 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -194,14 +194,14 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule { override def test(args: String*) = T.command { val framework = mill.scalajslib.ScalaJSBridge.scalaJSBridge().getFramework( toolsClasspath().map(_.path), - testFramework(), + testFrameworks().head, fastOptTest().path.toIO ) val (doneMsg, results) = mill.scalalib.ScalaWorkerApi .scalaWorker() .runTests( - _ => framework, + _ => Seq(framework), runClasspath().map(_.path), Agg(compile().classes.path), args diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala index f3dd7def..d616d1b0 100644 --- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala +++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala @@ -57,7 +57,7 @@ object HelloJSWorldTests extends TestSuite { extends BuildModule(crossScalaVersion, sjsVersion0) { object test extends super.Tests { override def sources = T.sources{ millSourcePath / 'src / 'utest } - def testFramework: T[String] = "utest.runner.Framework" + def testFrameworks = Seq("utest.runner.Framework") override def ivyDeps = Agg( ivy"com.lihaoyi:utest_sjs${scalaJSBinaryVersion()}_${Lib.scalaBinaryVersion(scalaVersion())}:0.6.3" ) @@ -69,7 +69,7 @@ object HelloJSWorldTests extends TestSuite { extends BuildModule(crossScalaVersion, sjsVersion0) { object test extends super.Tests { override def sources = T.sources{ millSourcePath / 'src / 'scalatest } - def testFramework: T[String] = "org.scalatest.tools.Framework" + def testFrameworks = Seq("org.scalatest.tools.Framework") override def ivyDeps = Agg( ivy"org.scalatest:scalatest_sjs${scalaJSBinaryVersion()}_${Lib.scalaBinaryVersion(scalaVersion())}:3.0.4" ) |