Added mockUiComponent test helper, fixed #6

Author: viktor-podzigun

core/src/main/scala/scommons/react/ClassComponent.scala

@@ -1,7 +1,7 @@
 package scommons.react
 
 import io.github.shogowada.scalajs.reactjs.React
-import io.github.shogowada.scalajs.reactjs.React.{Props, Self}
+import io.github.shogowada.scalajs.reactjs.React.Self
 
 import scala.scalajs.js
 
@@ -11,8 +11,8 @@ trait ClassComponent[T] extends UiComponent[T] {
     render: Self[T, S] => ReactElement,
     getInitialState: Self[T, S] => S = null,
     componentDidMount: Self[T, S] => Unit = null,
-    shouldComponentUpdate: (Self[T, S], Props[T], S) => Boolean = null,
-    componentDidUpdate: (Self[T, S], Props[T], S) => Unit = null,
+    shouldComponentUpdate: (Self[T, S], Props, S) => Boolean = null,
+    componentDidUpdate: (Self[T, S], Props, S) => Unit = null,
     componentWillUnmount: Self[T, S] => Unit = null,
     componentDidCatch: (Self[T, S], js.Object, js.Dynamic) => Unit = null
   ): ReactClass = {

core/src/main/scala/scommons/react/FunctionComponent.scala

@@ -6,8 +6,6 @@ import scala.scalajs.js
 
 trait FunctionComponent[T] extends UiComponent[T] {
 
-  type Props = reactjs.React.Props[T]
-
   protected def render(props: Props): ReactElement
 
   override protected def create(): ReactClass = {

core/src/main/scala/scommons/react/UiComponent.scala

@@ -1,7 +1,11 @@
 package scommons.react
 
+import io.github.shogowada.scalajs.reactjs
+
 trait UiComponent[T] {
 
+  type Props = reactjs.React.Props[T]
+
   def apply(): ReactClass = reactClass
 
   private lazy val reactClass: ReactClass = create()

test/src/main/scala/scommons/react/test/util/TestRendererUtils.scala

@@ -3,14 +3,17 @@ package scommons.react.test.util
 import io.github.shogowada.scalajs.reactjs.elements.ReactElement
 import org.scalactic.source.Position
 import org.scalatest.{Assertion, Succeeded}
-import scommons.react.UiComponent
+import scommons.react.{ReactClass, UiComponent}
 import scommons.react.test.raw
 import scommons.react.test.raw.{TestInstance, TestRenderer}
 import scommons.react.test.util.RendererUtils.{testInstanceUtils => utils}
+import scommons.react.test.util.TestRendererUtils.UiComponentMock
 
 import scala.scalajs.js
 
 trait TestRendererUtils {
+  
+  def mockUiComponent[T](name: String): UiComponent[T] = UiComponentMock[T](name)
 
   def createTestRenderer(element: ReactElement,
                          createMock: js.Function1[TestInstance, js.Any] = null): TestRenderer = {
@@ -73,3 +76,11 @@ trait TestRendererUtils {
     utils.assertNativeComponent(result, expectedElement, assertChildren)
   }
 }
+
+object TestRendererUtils {
+
+  private case class UiComponentMock[T](name: String) extends UiComponent[T] {
+
+    protected def create(): ReactClass = name.asInstanceOf[ReactClass]
+  }
+}

test/src/test/scala/scommons/react/test/util/TestRendererUtilsSpec.scala

@@ -14,6 +14,20 @@ class TestRendererUtilsSpec extends RendererUtilsSpec[TestInstance]
 
   protected def doRender(element: ReactElement): TestInstance = testRender(element)
 
+  TestComponent.childComp = mockUiComponent("SomeTestChild")
+
+  it should "render mockUiComponent" in {
+    //when
+    val result = testRender(<(TestComponent())()())
+    
+    //then
+    TestComponent.childComp.toString shouldBe "UiComponentMock(SomeTestChild)"
+    
+    assertTestComponent(result, TestComponent.childComp) { props =>
+      props shouldBe ()
+    }
+  }
+
   it should "render mock reference" in {
     //given
     val comp = new FunctionComponent[Unit] {
@@ -88,6 +102,19 @@ class TestRendererUtilsSpec extends RendererUtilsSpec[TestInstance]
 }
 
 object TestRendererUtilsSpec {
+  
+  object TestComponent extends FunctionComponent[Unit] {
+    
+    private[util] var childComp: UiComponent[Unit] = new FunctionComponent[Unit] {
+      protected def render(props: Props): ReactElement = {
+        <.>()()
+      }
+    }
+    
+    protected def render(props: TestComponent.Props): ReactElement = {
+      <(childComp())()()
+    }
+  }
 
   def createHTMLInputElement(focusMock: () => Unit): js.Object = {
     js.Dynamic.literal(