Skip to content

Commit 6f66ca7

Browse files
Disabled requireJsDomEnv in Test
1 parent a362d66 commit 6f66ca7

File tree

6 files changed

+8
-14
lines changed

6 files changed

+8
-14
lines changed

project/plugins.sbt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
//resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
22
resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
33

4-
//use patched versions by now, to make scoverage work with scalajs-bundler
5-
addSbtPlugin(("org.scommons.patched" % "sbt-scalajs-bundler" % "0.14.0-SNAPSHOT").force())
6-
7-
addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "1.0.0-SNAPSHOT").changing())
4+
addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.4.0-SNAPSHOT").changing())

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ object ReactShowcase extends ScalaJsModule {
2222
publishLocal := ((): Unit),
2323
publishM2 := ((): Unit),
2424

25-
requireJsDomEnv in Test := true,
26-
2725
coverageExcludedPackages :=
2826
"scommons.react.showcase.app.ShowcaseReactApp" +
2927
";scommons.react.showcase.dom.ReactPortalDemo",

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import sbt.Keys._
55
import sbt._
66
import scoverage.ScoverageKeys._
77

8-
import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
9-
108
object ReactTestDom extends ScalaJsModule {
119

1210
override val id: String = "scommons-react-test-dom"
@@ -18,9 +16,7 @@ object ReactTestDom extends ScalaJsModule {
1816
description := "Web DOM Scala.js, React.js testing utilities",
1917

2018
coverageEnabled := false, //until this is fixed: https://github.com/scalacenter/scalajs-bundler/issues/197
21-
coverageExcludedPackages := "scommons.react.test.dom.raw",
22-
23-
requireJsDomEnv in Test := true
19+
coverageExcludedPackages := "scommons.react.test.dom.raw"
2420
)
2521

2622
override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Seq(

test-dom/src/test/scala/scommons/react/test/dom/AsyncTestSpecTest.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package scommons.react.test.dom
22

33
import org.scalatest.time.{Millis, Span}
44

5-
class AsyncTestSpecTest extends AsyncTestSpec {
5+
//disabled until this is fixed: https://github.com/scalacenter/scalajs-bundler/issues/197
6+
trait AsyncTestSpecTest extends AsyncTestSpec {
67

78
implicit override val patienceConfig: PatienceConfig = PatienceConfig(
89
timeout = scaled(Span(500, Millis)),

test-dom/src/test/scala/scommons/react/test/dom/raw/SimulateSpec.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import scommons.react.test.dom.util.TestDOMUtils
66

77
import scala.scalajs.js
88

9-
class SimulateSpec extends TestSpec with TestDOMUtils {
9+
//disabled until this is fixed: https://github.com/scalacenter/scalajs-bundler/issues/197
10+
trait SimulateSpec extends TestSpec with TestDOMUtils {
1011

1112
it should "simulate onClick event" in {
1213
//given

test-dom/src/test/scala/scommons/react/test/dom/util/TestDOMUtilsSpec.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import org.scalatest.{Failed, OutcomeOf}
55
import scommons.react._
66
import scommons.react.test.TestSpec
77

8-
class TestDOMUtilsSpec extends TestSpec
8+
//disabled until this is fixed: https://github.com/scalacenter/scalajs-bundler/issues/197
9+
trait TestDOMUtilsSpec extends TestSpec
910
with TestDOMUtils
1011
with OutcomeOf {
1112

0 commit comments

Comments
 (0)