Attempt downstream test for CBIO bundle.

Author: rpiaggio

downstream-tests/build.sbt

@@ -173,6 +173,26 @@ lazy val jsCE = project
     },
   )
 
+lazy val jsCBIO = project
+  .in(file("js-cbio"))
+  .enablePlugins(ScalaJSPlugin)
+  .dependsOn(macros)
+  .configure(commonSettings, utestSettings, addReactJsDependencies(Test))
+  .settings(
+    scalaJSStage := jsStage,
+    libraryDependencies ++= {
+      val ver = version.value.stripSuffix("-SNAPSHOT") + "-SNAPSHOT"
+      Seq(
+        "com.github.japgolly.scalajs-react" %%% "core-bundle-cb_io" % ver,
+        "com.github.japgolly.scalajs-react" %%% "extra" % ver,
+        "com.github.japgolly.scalajs-react" %%% "test" % ver % Test,
+        Dep.microlibsCompileTime.value % Test,
+        Dep.microlibsTestUtil.value % Test,
+        Dep.scalaJsJavaTime.value % Test,
+      )
+    },
+  )
+
 lazy val generic = project
   .enablePlugins(ScalaJSPlugin)
   .configure(commonSettings)

downstream-tests/js-cbio/src/main/scala/downstream/Catnip.scala

@@ -0,0 +1,27 @@
+package downstream
+
+import cats.effect.IO
+import japgolly.scalajs.react._
+import japgolly.scalajs.react.vdom.html_<^._
+
+object Catnip {
+
+  final class Backend($: BackendScope[String, Int]) {
+    def render(p: String, s: Int) =
+      <.div(s"Hello($s) ", p)
+
+    def onMount: Callback =
+      $.props.map { p =>
+        Globals.catnipMounts :+= p
+      }
+
+    def onMount2: IO[Unit] =
+      $.setStateAsync(1)
+  }
+
+  val Component = ScalaComponent.builder[String]
+    .initialState(0)
+    .renderBackend[Backend]
+    .componentDidMount($ =>  $.backend.onMount2)
+    .build
+}

downstream-tests/js-cbio/src/main/scala/downstream/Exports.scala

@@ -0,0 +1,20 @@
+package downstream
+
+import japgolly.scalajs.react._
+import japgolly.scalajs.react.extra._
+import scala.scalajs.js.annotation._
+
+@JSExportTopLevel("EXPORTS")
+object Exports {
+
+  @JSExport
+  def exp = List[Any](
+    Routed.Component,
+    pxToCallback,
+  )
+
+  private def pxToCallback: CallbackTo[Int] = {
+    val x = Px.constByNeed(123).toCallback
+    x
+  }
+}

downstream-tests/js-cbio/src/main/scala/downstream/Globals.scala

@@ -0,0 +1,12 @@
+package downstream
+
+object Globals {
+
+  var catnipMounts = List.empty[String]
+
+  def clear(): Unit = {
+    catnipMounts = Nil
+  }
+
+  clear()
+}

downstream-tests/js-cbio/src/main/scala/downstream/Routed.scala

@@ -0,0 +1,34 @@
+package downstream
+
+import japgolly.scalajs.react._
+import japgolly.scalajs.react.extra.router._
+import japgolly.scalajs.react.vdom.html_<^._
+
+object Routed {
+
+  sealed trait Module
+  case object ModuleRoot extends Module
+  case object Module1 extends Module
+  case class Module2(i: Int) extends Module
+
+  val routerConfig = RouterConfigDsl[Module].buildConfig { dsl =>
+    import dsl._
+
+    def moduleRoot(ctl: RouterCtl[Module]) =
+      <.div(
+        ctl.link(Module1)("Module One"),
+        ctl.link(Module2(7))("Module 2.7"),
+      )
+
+    (emptyRule
+    | staticRoute(root, ModuleRoot) ~> renderR(moduleRoot)
+    | staticRoute("one", Module1) ~> render(<.h3("Module #1"))
+    | dynamicRouteCT("two" / int.caseClass[Module2]) ~> dynRender(m => <.h3(s"Module #2 @ ${m.i}"))
+    )
+      .notFoundDynamic(_ => CallbackTo(redirectToPage(ModuleRoot)(SetRouteVia.HistoryReplace)))
+      .verify(ModuleRoot, Module1, Module2(2))
+  }
+
+  val Component = RouterWithProps(BaseUrl("http://localhost/"), routerConfig)
+
+}

downstream-tests/js-cbio/src/test/scala/downstream/CBIOBundleTests.scala

@@ -0,0 +1,37 @@
+package downstream
+
+import japgolly.microlibs.testutil.TestUtil._
+import japgolly.scalajs.react.test.ReactTestUtils._
+import utest._
+import scala.concurrent.Future
+import scala.concurrent.Promise
+import concurrent.ExecutionContext.Implicits.global
+import cats.effect.IO
+import scalajs.js
+
+object CBIOBundleTests extends TestSuite {
+
+  def delay(milliseconds: Int): Future[Unit] = {
+    val p = Promise[Unit]()
+    js.timers.setTimeout(milliseconds) {
+      p.success(())
+    }
+    p.future
+  }
+
+  override def tests = Tests {
+    Globals.clear()
+
+    "catnip" - {
+      // withRenderedIntoDocumentAsync(Catnip.Component("omg")) { m =>
+      withRenderedIntoDocumentFuture(Catnip.Component("omg")) { m =>
+        delay(500).map(_ =>
+          // assertEq(Globals.catnipMounts, List("omg"))
+            assertEq(m.showDom(), "<div>Hello(1) omg</div>")
+          )
+      }
+      // assertEq(Globals.catnipMounts, List("omg"))
+    }
+
+  }
+}

downstream-tests/js/src/main/scala/downstream/Exports.scala

@@ -26,7 +26,7 @@ object Exports {
   )
 
   private def modStateFnPure: ModStateFnPure[Int] =
-    ModStateFn((mod, cb) => Callback.log(mod(1).isDefined) >> cb)
+    ModStateFn((mod, cb) => Callback.log(mod(1).isDefined) >> Callback(cb()))
 
   private def pxToCallback: CallbackTo[Int] = {
     val x = Px.constByNeed(123).toCallback

downstream-tests/run

@@ -18,7 +18,7 @@ all_tests_values=(
   "-Ddownstream_tests.fullOptJS -Ddownstream_tests.reusability.dev=overlay"
 )
 all_tests_keys=()
-declare -A all_tests
+declare -a all_tests
 i=0
 for t in "${all_tests_values[@]}"; do
   i=$((i+1))

tests/src/test/scala/japgolly/scalajs/react/test/TestTest.scala

@@ -253,7 +253,7 @@ object TestTest extends TestSuite {
       assert(body1 == body2)
     }
 
-    "withRenderedIntoDocumentAsync" - {
+    "withRenderedIntoDocumentFuture" - {
       var m: ScalaComponent.MountedImpure[Unit, Boolean, Unit] = null
       val promise: Promise[Unit] = Promise[Unit]()
       ReactTestUtils.withRenderedIntoDocumentFuture(IC()) { mm =>