Use AsyncTestSpec from scommons-nodejs-test module

Author: viktor-podzigun

project/src/main/scala/common/Libs.scala

@@ -6,6 +6,7 @@ import scommons.sbtplugin.project.CommonLibs
 
 object Libs extends CommonLibs {
 
+  val scommonsNodejsVersion = "0.3.1"
   private val sjsReactJsVer = "0.14.0"
 
   lazy val sjsReactJs = Def.setting("io.github.shogowada" %%% "scalajs-reactjs" % sjsReactJsVer)

project/src/main/scala/common/TestLibs.scala

@@ -1,7 +1,11 @@
 package common
 
+import common.Libs._
+import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
+import sbt._
 import scommons.sbtplugin.project.CommonTestLibs
 
 object TestLibs extends CommonTestLibs {
 
+  lazy val scommonsNodejsTest = Def.setting("org.scommons.nodejs" %%% "scommons-nodejs-test" % scommonsNodejsVersion)
 }

project/src/main/scala/definitions/ReactCore.scala

@@ -16,9 +16,7 @@ object ReactCore extends ScalaJsModule {
   override def definition: Project = super.definition
     .settings(
       description := "Scala.js facades for React.js core utilities and components",
-      coverageExcludedPackages := "scommons.react.raw",
-
-      requireJsDomEnv in Test := false
+      coverageExcludedPackages := "scommons.react.raw"
     )
 
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Nil

project/src/main/scala/definitions/ReactDom.scala

@@ -16,9 +16,7 @@ object ReactDom extends ScalaJsModule {
   override def definition: Project = super.definition
     .settings(
       description := "Scala.js facades for React.js DOM utilities and components",
-      coverageExcludedPackages := "scommons.react.dom.raw",
-
-      requireJsDomEnv in Test := true
+      coverageExcludedPackages := "scommons.react.dom.raw"
     )
 
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Seq(

project/src/main/scala/definitions/ReactRedux.scala

@@ -4,8 +4,6 @@ import common.{Libs, TestLibs}
 import sbt.Keys._
 import sbt._
 
-import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
-
 object ReactRedux extends ScalaJsModule {
 
   override val id: String = "scommons-react-redux"
@@ -14,23 +12,19 @@ object ReactRedux extends ScalaJsModule {
 
   override def definition: Project = super.definition
     .settings(
-      description := "Scala.js facades for react-redux utilities and components",
-
-      requireJsDomEnv in Test := true
+      description := "Scala.js facades for react-redux utilities and components"
     )
 
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Seq(
     ReactCore.definition,
-    ReactTest.definition % "test",
-    ReactTestDom.definition % "test"
+    ReactTest.definition % "test"
   )
 
   override val runtimeDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(
     Libs.sjsReactJsRedux.value
   ))
 
   override val testDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(
-    TestLibs.scalaTestJs.value,
-    TestLibs.scalaMockJs.value
+    TestLibs.scommonsNodejsTest.value
   ).map(_ % "test"))
 }

project/src/main/scala/definitions/ReactShowcase.scala

@@ -1,5 +1,6 @@
 package definitions
 
+import common.TestLibs
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import sbt.Keys._
 import sbt._
@@ -21,6 +22,8 @@ object ReactShowcase extends ScalaJsModule {
       publishLocal := ((): Unit),
       publishM2 := ((): Unit),
 
+      requireJsDomEnv in Test := true,
+
       coverageExcludedPackages :=
         "scommons.react.showcase.app.ShowcaseReactApp" +
           ";scommons.react.showcase.dom.ReactPortalDemo",
@@ -45,13 +48,14 @@ object ReactShowcase extends ScalaJsModule {
     ReactCore.definition,
     ReactDom.definition,
     ReactRedux.definition,
-    ReactTest.definition % "test",
-    ReactTestDom.definition % "test"
+    ReactTest.definition % "test"
   )
 
   override val superRepoProjectsDependencies: Seq[(String, String, Option[String])] = Nil
 
   override val runtimeDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Nil)
 
-  override val testDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Nil)
+  override val testDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(
+    TestLibs.scommonsNodejsTest.value
+  ).map(_ % "test"))
 }

project/src/main/scala/definitions/ReactTest.scala

@@ -20,13 +20,12 @@ object ReactTest extends ScalaJsModule {
 
       npmDependencies in Compile ++= Seq(
         "react-test-renderer" -> "^16.8.0"
-      ),
+      )
 
 //      npmResolutions in Test := Map(
 //        "react" -> "^16.8.0",
 //        "react-dom" -> "^16.8.0" //TODO: remove dependency on the react-dom !!!
 //      ),
-      requireJsDomEnv in Test := false
     )
 
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Seq(

project/src/main/scala/definitions/ReactTestDom.scala

@@ -3,7 +3,7 @@ package definitions
 import common.TestLibs
 import sbt.Keys._
 import sbt._
-import scoverage.ScoverageKeys.coverageExcludedPackages
+import scoverage.ScoverageKeys._
 
 import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
 
@@ -16,6 +16,8 @@ object ReactTestDom extends ScalaJsModule {
   override def definition: Project = super.definition
     .settings(
       description := "Web DOM Scala.js, React.js testing utilities",
+      
+      coverageEnabled := false, //until this is fixed: https://github.com/scalacenter/scalajs-bundler/issues/197
       coverageExcludedPackages := "scommons.react.test.dom.raw",
 
       requireJsDomEnv in Test := true

project/src/main/scala/definitions/ScalaJsModule.scala

@@ -5,12 +5,16 @@ import sbt._
 import scommons.sbtplugin.project.CommonClientModule
 
 import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin
+import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
 
 trait ScalaJsModule extends ReactModule {
 
   override def definition: Project = {
     super.definition
       .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
       .settings(CommonClientModule.settings: _*)
+      .settings(
+        requireJsDomEnv in Test := false
+      )
   }
 }

redux/src/test/scala/scommons/react/redux/task/FutureTaskSpec.scala

@@ -1,7 +1,7 @@
 package scommons.react.redux.task
 
 import org.scalatest.Succeeded
-import scommons.react.test.dom.AsyncTestSpec
+import scommons.nodejs.test.AsyncTestSpec
 
 import scala.concurrent.Future
 import scala.util.{Success, Try}