From 770e0f6b33787b40c7baf8ae404d2a6e2b8d5f87 Mon Sep 17 00:00:00 2001
From: Tobias Schlatter <tobias@meisch.ch>
Date: Sat, 20 Oct 2018 08:54:40 +0200
Subject: [PATCH] Upgrade to Scala.js 1.0.0-M6

---
 .../jsdomnodejs/JSDOMNodeJSEnvTest.scala      | 34 +++++--------------
 .../jsenv/jsdomnodejs/JSDOMNodeJSSuite.scala  |  9 +----
 project/plugins.sbt                           |  4 +--
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnvTest.scala b/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnvTest.scala
index cd7a722..4199f9d 100644
--- a/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnvTest.scala
+++ b/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnvTest.scala
@@ -1,42 +1,24 @@
 package org.scalajs.jsenv.jsdomnodejs
 
-import scala.concurrent.Await
+import scala.concurrent.duration._
 
 import org.junit.Test
 
-import org.scalajs.io._
-
-import org.scalajs.jsenv._
+import org.scalajs.jsenv.test.kit.TestKit
 
 class JSDOMNodeJSEnvTest {
-
-  private val TestRunConfig = {
-    RunConfig()
-      .withInheritOut(false)
-      .withOnOutputStream((_, _) => ()) // ignore stdout
-  }
-
-  private val config = JSDOMNodeJSSuite.Config
+  private val kit = new TestKit(new JSDOMNodeJSEnv, 1.minute)
 
   @Test
-  def historyAPIWithoutTestKit: Unit = {
-    assertRunSucceeds(
+  def historyAPI: Unit = {
+    kit.withRun(
         """
         |console.log(window.location.href);
         |window.history.pushState({}, "", "/foo");
         |console.log(window.location.href);
-        """.stripMargin)
-  }
-
-  private def assertRunSucceeds(inputStr: String): Unit = {
-    val inputFile = MemVirtualBinaryFile.fromStringUTF8("test.js", inputStr)
-    val input = Input.ScriptsToLoad(List(inputFile))
-    val run = config.jsEnv.start(input, TestRunConfig)
-    try {
-      Await.result(run.future, config.awaitTimeout)
-    } finally {
-      run.close()
+        """.stripMargin) {
+      _.expectOut("http://localhost/\n")
+        .expectOut("http://localhost/foo\n")
     }
   }
-
 }
diff --git a/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSSuite.scala b/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSSuite.scala
index b06fa90..9b20dac 100644
--- a/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSSuite.scala
+++ b/jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSSuite.scala
@@ -5,11 +5,4 @@ import org.scalajs.jsenv.test._
 import org.junit.runner.RunWith
 
 @RunWith(classOf[JSEnvSuiteRunner])
-class JSDOMNodeJSSuite extends JSEnvSuite(JSDOMNodeJSSuite.Config)
-
-object JSDOMNodeJSSuite {
-  val Config = {
-    JSEnvSuiteConfig(new JSDOMNodeJSEnv)
-      .withTerminateVMJSCode("__ScalaJSEnv.exitFunction(0)")
-  }
-}
+class JSDOMNodeJSSuite extends JSEnvSuite(JSEnvSuiteConfig(new JSDOMNodeJSEnv))
diff --git a/project/plugins.sbt b/project/plugins.sbt
index de146d8..8ea91c1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M5")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M6")
 
-libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M5"
+libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M6"
 
 unmanagedSourceDirectories in Compile +=
   baseDirectory.value.getParentFile / "jsdom-nodejs-env/src/main/scala"