fix scalalib tests

2 files changed, 8 insertions, 4 deletions

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala b/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
index 6b471164..8152d3d1 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
@@ -20,7 +20,10 @@ class ScalaJSWorker {
     scalaInstanceCache match {
       case Some((sig, bridge)) if sig == classloaderSig => bridge
       case _ =>
-        val cl = new URLClassLoader(toolsClasspath.map(_.toIO.toURI.toURL).toArray)
+        val cl = new URLClassLoader(
+          toolsClasspath.map(_.toIO.toURI.toURL).toArray,
+          getClass.getClassLoader
+        )
         val bridge = cl
           .loadClass("mill.scalajslib.bridge.ScalaJSBridge")
           .getDeclaredConstructor()
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 18fbc269..12102666 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -17,7 +17,7 @@ import scala.collection.JavaConverters._
 
 
 object HelloJSWorldTests extends TestSuite {
-  val workspacePath = TestEvaluator.getOutPathStatic()
+  val workspacePath =  TestUtil.getOutPathStatic() / "hello-js-world"
 
   trait HelloJSWorldModule extends ScalaJSModule with PublishModule {
     override def millSourcePath = workspacePath
@@ -89,10 +89,11 @@ object HelloJSWorldTests extends TestSuite {
   }
 
   def runJS(path: Path): String = {
-    val engineManager = new ScriptEngineManager
+    val engineManager = new ScriptEngineManager(null)
     val engine = engineManager.getEngineByName("nashorn")
     val console = new Console
-    engine.getBindings(ScriptContext.ENGINE_SCOPE).put("console", console)
+    val bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE)
+    bindings.put("console", console)
     engine.eval(new FileReader(path.toIO))
     console.out.toString
   }