WIP: Scala js testing (#119)

fixes #102. Use scala js testing framework to launch tests

1 files changed, 4 insertions, 6 deletions

diff --git a/scalaworker/src/mill/scalaworker/ScalaWorker.scala b/scalaworker/src/mill/scalaworker/ScalaWorker.scala
index dfb8892a..70cfb604 100644
--- a/scalaworker/src/mill/scalaworker/ScalaWorker.scala
+++ b/scalaworker/src/mill/scalaworker/ScalaWorker.scala
@@ -37,7 +37,7 @@ object ScalaWorker{
   def main(args: Array[String]): Unit = {
     try{
       val result = new ScalaWorker(null).apply(
-        frameworkName = args(0),
+        frameworkInstance = TestRunner.framework(args(0)),
         entireClasspath = Agg.from(args(1).split(" ").map(Path(_))),
         testClassfilePath = Agg.from(args(2).split(" ").map(Path(_))),
         args = args(3) match{ case "" => Nil case x => x.split(" ").toList }
@@ -194,16 +194,14 @@ class ScalaWorker(ctx0: mill.util.Ctx) extends mill.scalalib.ScalaWorkerApi{
     CompilationResult(zincFile, PathRef(classesDir))
   }
 
-  def apply(frameworkName: String,
+  def apply(frameworkInstance: ClassLoader => sbt.testing.Framework,
             entireClasspath: Agg[Path],
             testClassfilePath: Agg[Path],
             args: Seq[String])
            (implicit ctx: mill.util.Ctx.LogCtx): (String, Seq[Result]) = {
 
     Jvm.inprocess(entireClasspath, classLoaderOverrideSbtTesting = true, cl => {
-      val framework = cl.loadClass(frameworkName)
-        .newInstance()
-        .asInstanceOf[sbt.testing.Framework]
+      val framework = frameworkInstance(cl)
 
       val testClasses = runTests(cl, framework, testClassfilePath)
 
@@ -287,4 +285,4 @@ class ScalaWorker(ctx0: mill.util.Ctx) extends mill.scalalib.ScalaWorkerApi{
     }
     testClasses
   }
-}
\ No newline at end of file
+}