Skip to content

Commit 297ada5

Browse files
viktor-podzigunviktor-podzigun
committed
Added scommons.react.test and test.dom package objects, fixed #1 
1 parent a426e6f commit 297ada5

18 files changed

+69
-67
lines changed

‎showcase/src/test/scala/scommons/react/showcase/ClassComponentDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package scommons.react.showcase
22

33
import scommons.react._
4-
import scommons.react.test.TestSpec
5-
import scommons.react.test.dom.util.TestDOMUtils
6-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
4+
import scommons.react.test._
5+
import scommons.react.test.dom._
76

87
import scala.scalajs.js
98

‎showcase/src/test/scala/scommons/react/showcase/ErrorBoundaryDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package scommons.react.showcase
22

33
import org.scalajs.dom.{Event, window}
44
import scommons.react._
5-
import scommons.react.test.TestSpec
6-
import scommons.react.test.dom.util.TestDOMUtils
7-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
5+
import scommons.react.test._
6+
import scommons.react.test.dom._
87

98
import scala.scalajs.js
109

‎showcase/src/test/scala/scommons/react/showcase/FunctionComponentDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package scommons.react.showcase
22

33
import scommons.react._
4-
import scommons.react.test.TestSpec
5-
import scommons.react.test.dom.util.TestDOMUtils
6-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
4+
import scommons.react.test._
5+
import scommons.react.test.dom._
76

87
import scala.scalajs.js
98

‎showcase/src/test/scala/scommons/react/showcase/ReactFragmentDemoSpec.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package scommons.react.showcase
22

33
import scommons.react._
4-
import scommons.react.test.TestSpec
5-
import scommons.react.test.dom.util.TestDOMUtils
6-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
4+
import scommons.react.raw.React.{Fragment => ReactFragment}
5+
import scommons.react.test._
6+
import scommons.react.test.dom._
77

88
class ReactFragmentDemoSpec extends TestSpec
99
with TestDOMUtils
@@ -38,7 +38,7 @@ class ReactFragmentDemoSpec extends TestSpec
3838
val result = shallowRender(comp)
3939

4040
//then
41-
result.`type` shouldBe raw.React.Fragment
41+
result.`type` shouldBe ReactFragment
4242

4343
assertNativeComponent(result,
4444
<.>()(

‎showcase/src/test/scala/scommons/react/showcase/ReactMemoDemoSpec.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package scommons.react.showcase
22

3-
import scommons.react.test.TestSpec
4-
import scommons.react.test.raw.TestRenderer
5-
import scommons.react.test.util.TestRendererUtils
3+
import scommons.react.test._
64

75
class ReactMemoDemoSpec extends TestSpec with TestRendererUtils {
86

‎showcase/src/test/scala/scommons/react/showcase/ReactRefDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package scommons.react.showcase
22

33
import org.scalajs.dom.document
4-
import scommons.react.test.TestSpec
5-
import scommons.react.test.dom.util.TestDOMUtils
6-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
4+
import scommons.react.test._
5+
import scommons.react.test.dom._
76

87
class ReactRefDemoSpec extends TestSpec
98
with TestDOMUtils

‎showcase/src/test/scala/scommons/react/showcase/app/ShowcaseReactAppSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package scommons.react.showcase.app
22

33
import org.scalajs.dom
4-
import scommons.react.test.TestSpec
5-
import scommons.react.test.dom.util.TestDOMUtils
4+
import scommons.react.test._
5+
import scommons.react.test.dom._
66

77
class ShowcaseReactAppSpec extends TestSpec with TestDOMUtils {
88

‎showcase/src/test/scala/scommons/react/showcase/app/counter/CounterPanelSpec.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package scommons.react.showcase.app.counter
22

3-
import org.scalajs.dom
3+
import org.scalajs.dom.document
44
import scommons.react._
55
import scommons.react.redux.task.FutureTask
66
import scommons.react.showcase.app.counter.CounterActions._
7-
import scommons.react.test.TestSpec
8-
import scommons.react.test.dom.util.TestDOMUtils
9-
import scommons.react.test.util.ShallowRendererUtils
7+
import scommons.react.test._
8+
import scommons.react.test.dom._
109

1110
import scala.concurrent.Future
1211

@@ -21,7 +20,7 @@ class CounterPanelSpec extends TestSpec
2120
val state = CounterState(123)
2221
val props = CounterPanelProps(dispatch, actions, state)
2322
domRender(<(CounterPanel())(^.wrapped := props)())
24-
val button = dom.document.body.querySelectorAll("button").item(0)
23+
val button = document.body.querySelectorAll("button").item(0)
2524
val action = CounterChangeAction(
2625
FutureTask("Changing Counter", Future.successful(0))
2726
)
@@ -41,7 +40,7 @@ class CounterPanelSpec extends TestSpec
4140
val state = CounterState(123)
4241
val props = CounterPanelProps(dispatch, actions, state)
4342
domRender(<(CounterPanel())(^.wrapped := props)())
44-
val button = dom.document.body.querySelectorAll("button").item(1)
43+
val button = document.body.querySelectorAll("button").item(1)
4544
val action = CounterChangeAction(
4645
FutureTask("Changing Counter", Future.successful(0))
4746
)

‎showcase/src/test/scala/scommons/react/showcase/dom/ReactPortalDemoSpec.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package scommons.react.showcase.dom
22

3-
import org.scalajs.dom
3+
import org.scalajs.dom.{Element, document}
44
import scommons.react._
5-
import scommons.react.test.TestSpec
6-
import scommons.react.test.dom.util.TestDOMUtils
5+
import scommons.react.test._
6+
import scommons.react.test.dom._
77

88
class ReactPortalDemoSpec extends TestSpec with TestDOMUtils {
99

@@ -14,7 +14,7 @@ class ReactPortalDemoSpec extends TestSpec with TestDOMUtils {
1414
))
1515

1616
assertDOMElement(domContainer, <.div()())
17-
assertDOMElement(dom.document.body.querySelector(".portal-content"),
17+
assertDOMElement(document.body.querySelector(".portal-content"),
1818
<.div(^("class") := "portal-content")(
1919
"Portal Child"
2020
)
@@ -23,7 +23,7 @@ class ReactPortalDemoSpec extends TestSpec with TestDOMUtils {
2323
//when & then
2424
domRender(<(ReactPortalDemo())(^.wrapped := ReactPortalDemoProps(show = false))())
2525

26-
dom.document.body.querySelectorAll(".portal-content").length shouldBe 0
26+
document.body.querySelectorAll(".portal-content").length shouldBe 0
2727
}
2828

2929
it should "re-render portal content" in {
@@ -32,7 +32,7 @@ class ReactPortalDemoSpec extends TestSpec with TestDOMUtils {
3232
"Portal Child"
3333
))
3434
assertDOMElement(domContainer, <.div()())
35-
assertDOMElement(dom.document.body.querySelector(".portal-content"),
35+
assertDOMElement(document.body.querySelector(".portal-content"),
3636
<.div(^("class") := "portal-content")(
3737
"Portal Child"
3838
)
@@ -42,15 +42,15 @@ class ReactPortalDemoSpec extends TestSpec with TestDOMUtils {
4242
domRender(<(ReactPortalDemo())(^.wrapped := ReactPortalDemoProps(show = true))(
4343
"Portal Updated"
4444
))
45-
assertDOMElement(dom.document.body.querySelector(".portal-content"),
45+
assertDOMElement(document.body.querySelector(".portal-content"),
4646
<.div(^("class") := "portal-content")(
4747
"Portal Updated"
4848
)
4949
)
5050

5151
//when & then
5252
domRender(<(ReactPortalDemo())(^.wrapped := ReactPortalDemoProps(show = false))())
53-
dom.document.body.querySelectorAll(".portal-content").length shouldBe 0
53+
document.body.querySelectorAll(".portal-content").length shouldBe 0
5454
}
5555

5656
it should "render several portals" in {
@@ -81,20 +81,20 @@ class ReactPortalDemoSpec extends TestSpec with TestDOMUtils {
8181

8282
assertDOMElement(domContainer, <.div()())
8383

84-
val portals = dom.document.body.querySelectorAll(".portal-content")
85-
assertDOMElement(portals.item(0).asInstanceOf[dom.Element],
84+
val portals = document.body.querySelectorAll(".portal-content")
85+
assertDOMElement(portals.item(0).asInstanceOf[Element],
8686
<.div(^("class") := "portal-content")(
8787
"Portal 1"
8888
)
8989
)
90-
assertDOMElement(portals.item(1).asInstanceOf[dom.Element],
90+
assertDOMElement(portals.item(1).asInstanceOf[Element],
9191
<.div(^("class") := "portal-content")(
9292
"Portal 2"
9393
)
9494
)
9595

9696
//when & then
9797
domRender(<(comp())(^.wrapped := Tuple2(false, false))())
98-
dom.document.body.querySelectorAll(".portal-content").length shouldBe 0
98+
document.body.querySelectorAll(".portal-content").length shouldBe 0
9999
}
100100
}

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseContextDemoSpec.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ package scommons.react.showcase.hooks
22

33
import scommons.react._
44
import scommons.react.showcase.hooks.UseContextDemoApp._
5-
import scommons.react.test.TestSpec
6-
import scommons.react.test.dom.util.TestDOMUtils
7-
import scommons.react.test.raw.{ShallowInstance, TestRenderer}
8-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
5+
import scommons.react.test._
6+
import scommons.react.test.dom._
97

108
class UseContextDemoSpec extends TestSpec
119
with TestDOMUtils

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseEffectDemoSpec.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package scommons.react.showcase.hooks
22

3-
import scommons.react.test.TestSpec
4-
import scommons.react.test.dom.util.TestDOMUtils
5-
import scommons.react.test.raw.TestRenderer
6-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
3+
import scommons.react.test._
4+
import scommons.react.test.dom._
75

86
class UseEffectDemoSpec extends TestSpec
97
with TestDOMUtils

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseLayoutEffectDemoSpec.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package scommons.react.showcase.hooks
22

3-
import scommons.react.test.TestSpec
4-
import scommons.react.test.dom.util.TestDOMUtils
5-
import scommons.react.test.raw.TestRenderer
6-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
3+
import scommons.react.test._
4+
import scommons.react.test.dom._
75

86
class UseLayoutEffectDemoSpec extends TestSpec
97
with TestDOMUtils

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseMemoDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package scommons.react.showcase.hooks
22

3-
import scommons.react.test.TestSpec
4-
import scommons.react.test.dom.util.TestDOMUtils
5-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
3+
import scommons.react.test._
4+
import scommons.react.test.dom._
65

76
class UseMemoDemoSpec extends TestSpec
87
with TestDOMUtils

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseReducerDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package scommons.react.showcase.hooks
22

3-
import scommons.react.test.TestSpec
4-
import scommons.react.test.dom.util.TestDOMUtils
5-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
3+
import scommons.react.test._
4+
import scommons.react.test.dom._
65

76
class UseReducerDemoSpec extends TestSpec
87
with TestDOMUtils

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseRefDemoSpec.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package scommons.react.showcase.hooks
22

3-
import org.scalajs.dom
3+
import org.scalajs.dom.document
44
import scommons.react._
5-
import scommons.react.test.TestSpec
6-
import scommons.react.test.dom.util.TestDOMUtils
7-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
5+
import scommons.react.test._
6+
import scommons.react.test.dom._
87

98
class UseRefDemoSpec extends TestSpec
109
with TestDOMUtils
@@ -30,14 +29,14 @@ class UseRefDemoSpec extends TestSpec
3029
domRender(<(UseRefDemo())()())
3130

3231
val button = domContainer.querySelector("button")
33-
dom.document.hasFocus() shouldBe false
32+
document.hasFocus() shouldBe false
3433

3534
//when
3635
fireDomEvent(Simulate.click(button))
3736

3837
//then
39-
domContainer.querySelector("input") shouldBe dom.document.activeElement
40-
dom.document.hasFocus() shouldBe true
38+
domContainer.querySelector("input") shouldBe document.activeElement
39+
document.hasFocus() shouldBe true
4140
}
4241

4342
it should "shallow render component" in {

‎showcase/src/test/scala/scommons/react/showcase/hooks/UseStateDemoSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package scommons.react.showcase.hooks
22

3-
import scommons.react.test.TestSpec
4-
import scommons.react.test.dom.util.TestDOMUtils
5-
import scommons.react.test.util.{ShallowRendererUtils, TestRendererUtils}
3+
import scommons.react.test._
4+
import scommons.react.test.dom._
65

76
class UseStateDemoSpec extends TestSpec
87
with TestDOMUtils

‎test-dom/src/main/scala/scommons/react/test/dom/package.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package scommons.react.test
2+
3+
package object dom {
4+
5+
lazy val ReactTestUtils = dom.raw.ReactTestUtils
6+
lazy val TestReactDOM = dom.raw.TestReactDOM
7+
type TestDOMUtils = dom.util.TestDOMUtils
8+
}

‎test/src/main/scala/scommons/react/test/package.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package scommons.react
2+
3+
package object test {
4+
5+
type ShallowInstance = test.raw.ShallowInstance
6+
type ShallowRendererUtils = test.util.ShallowRendererUtils
7+
8+
lazy val TestRenderer = test.raw.TestRenderer
9+
type TestInstance = test.raw.TestInstance
10+
type TestRendererUtils = test.util.TestRendererUtils
11+
}

0 commit comments

Comments
 (0)