Update sbt-plugin tests to use new linking tasks

scala-js · Sep 16, 2020 · 7846888 · 7846888
1 parent 993d734
commit 7846888
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 29 deletions.
diff --git a/sbt-plugin/src/sbt-test/incremental/change-config-and-source/test b/sbt-plugin/src/sbt-test/incremental/change-config-and-source/test
@@ -1,16 +1,16 @@
 $ copy-file Main.scala.first Main.scala
-> fastOptJS
-$ copy-file target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-1.js
+> linkJSDev
+$ copy-file target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-1.js
 
-# When the linker config and source both change, re-running fastOptJS should re-link:
+# When the linker config and source both change, re-running linkJSDev should re-link:
 > set scalaJSLinkerConfig ~= (_.withOptimizer(false))
 $ copy-file Main.scala.second Main.scala
-> fastOptJS
--$ must-mirror target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-1.js
-$ newer target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-1.js
-$ copy-file target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-2.js
+> linkJSDev
+-$ must-mirror target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-1.js
+$ newer target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-1.js
+$ copy-file target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-2.js
 
 # However, this re-linking should not happen more than once:
-> fastOptJS
-$ must-mirror target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-2.js
--$ newer target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-2.js
+> linkJSDev
+$ must-mirror target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-2.js
+-$ newer target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-2.js
diff --git a/sbt-plugin/src/sbt-test/incremental/change-config/test b/sbt-plugin/src/sbt-test/incremental/change-config/test
@@ -1,14 +1,14 @@
-> fastOptJS
-$ copy-file target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-1.js
+> linkJSDev
+$ copy-file target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-1.js
 
-# When the linker config changes, re-running fastOptJS should re-link:
+# When the linker config changes, re-running linkJSDev should re-link:
 > set scalaJSLinkerConfig ~= (_.withOptimizer(false))
-> fastOptJS
--$ must-mirror target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-1.js
-$ newer target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-1.js
-$ copy-file target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-2.js
+> linkJSDev
+-$ must-mirror target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-1.js
+$ newer target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-1.js
+$ copy-file target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-2.js
 
 # However, this re-linking should not happen more than once:
-> fastOptJS
-$ must-mirror target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-2.js
--$ newer target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-2.js
+> linkJSDev
+$ must-mirror target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-2.js
+-$ newer target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-2.js
diff --git a/sbt-plugin/src/sbt-test/incremental/fix-compile-error/test b/sbt-plugin/src/sbt-test/incremental/fix-compile-error/test
@@ -1,6 +1,6 @@
 $ copy-file Data.scala.good Data.scala
-> fastOptJS
+> linkJSDev
 $ copy-file Data.scala.broken Data.scala
--> fastOptJS
+-> linkJSDev
 $ copy-file Data.scala.fixed Data.scala
-> fastOptJS
+> linkJSDev
diff --git a/sbt-plugin/src/sbt-test/linker/custom-linker/build.sbt b/sbt-plugin/src/sbt-test/linker/custom-linker/build.sbt
@@ -36,7 +36,7 @@ lazy val main = project
   )
 
 check := {
-  val modules = (scalaJSImportedModules in (main, Compile, fastOptJS)).value
+  val modules = (scalaJSImportedModules in (main, Compile, linkJSDev)).value
   val expected = Set("foo.js", "bar.js")
   // test sizes as well to make sure that there are no duplicates in `modules`
   assert(modules.size == expected.size && modules.toSet == expected,

diff --git a/sbt-plugin/src/sbt-test/linker/custom-linker/project/CustomScalaJSLinkerPlugin.scala b/sbt-plugin/src/sbt-test/linker/custom-linker/project/CustomScalaJSLinkerPlugin.scala
@@ -41,7 +41,7 @@ object CustomScalaJSLinkerPlugin extends AutoPlugin {
   }
 
   private def scalaJSStageSettings(stage: Stage,
-      key: TaskKey[Attributed[File]]): Seq[Setting[_]] = {
+      key: TaskKey[Attributed[Report]]): Seq[Setting[_]] = {
     val entryPointOutputFileName =
       s"entrypoints-${stage.toString.toLowerCase}.txt"
 
@@ -91,8 +91,8 @@ object CustomScalaJSLinkerPlugin extends AutoPlugin {
   )
 
   private lazy val configSettings: Seq[Setting[_]] = Def.settings(
-    scalaJSStageSettings(FastOptStage, fastOptJS),
-    scalaJSStageSettings(FullOptStage, fullOptJS),
+    scalaJSStageSettings(FastOptStage, linkJSDev),
+    scalaJSStageSettings(FullOptStage, linkJSProd),
   )
 
   override def projectSettings: Seq[Setting[_]] = Def.settings(

diff --git a/sbt-plugin/src/sbt-test/linker/no-root-dependency-resolution/test b/sbt-plugin/src/sbt-test/linker/no-root-dependency-resolution/test
@@ -1 +1 @@
-> my-project/compile:fastOptJS
+> my-project/compile:linkJSDev
diff --git a/sbt-plugin/src/sbt-test/linker/non-existent-classpath/test b/sbt-plugin/src/sbt-test/linker/non-existent-classpath/test
@@ -1 +1 @@
-> fastOptJS
+> linkJSDev