Rename ReactTestUtils.removeReact{DataAttr ⇒ Internals} and remove React text annotation

Author: japgolly

README.md

@@ -228,5 +228,3 @@ new releases for scalacss & test-state
 
 upgrade to latest React
 
-<!-- react-text: 19 -->Description<!-- /react-text -->
-

migrate.sh

@@ -81,6 +81,7 @@ find . -name '*.scala' -type f -exec perl -pi -e '
   s/(?<=\n) *import +Simulate *\n//g;
   s/(?<=\n) *import +japgolly.scalajs.react.test.Simulate *\n+( *import +japgolly.scalajs.react.test._ *\n)/\1/g;
   s/(?<=\n)( *import +japgolly.scalajs.react.test._ *\n)\s*import +japgolly.scalajs.react.test.Simulate *\n/\1/g;
+  s/(?<=remove|ithout)ReactDataAttr/ReactInternals/g;
 
   s/(\$[ .]+)zoomL(?!\w)/\1zoomStateL/g;
 

test/src/main/scala/japgolly/scalajs/react/test/ReactTestUtils.scala

@@ -199,11 +199,14 @@ object ReactTestUtils {
     modifyProps(c)(m, _ => p)
 
   private val reactDataAttrRegex = """\s+data-react\S*?\s*?=\s*?".*?"""".r
+  private val reactTextCommentRegex = """<!-- /?react-text[: ].*?-->""".r
 
   /**
     * Turn `&lt;div data-reactroot=""&gt;hello&lt/div&gt;`
     * into `&lt;div&gt;hello&lt/div&gt;`
     */
-  def removeReactDataAttr(html: String): String =
-    reactDataAttrRegex.replaceAllIn(html, "")
+  def removeReactInternals(html: String): String =
+    reactDataAttrRegex.replaceAllIn(
+      reactTextCommentRegex.replaceAllIn(
+        html, ""), "")
 }

test/src/main/scala/japgolly/scalajs/react/test/package.scala

@@ -15,7 +15,7 @@ package object test {
     m.rawElement
 
   implicit final class ReactTestExt_MountedId(private val c: GenericComponent.MountedImpure[_, _]) extends AnyVal {
-    def outerHtmlWithoutReactDataAttr(): String =
-      ReactTestUtils.removeReactDataAttr(c.getDOMNode.outerHTML)
+    def outerHtmlWithoutReactInternals(): String =
+      ReactTestUtils.removeReactInternals(c.getDOMNode.outerHTML)
   }
 }

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

@@ -185,7 +185,7 @@ object TestTest extends TestSuite {
       ReactTestUtils.withRenderedIntoDocument(IC()) { mm =>
         m = mm
         val n = m.getDOMNode
-        assert(ReactTestUtils.removeReactDataAttr(n.outerHTML) startsWith "<label><input ")
+        assert(ReactTestUtils.removeReactInternals(n.outerHTML) startsWith "<label><input ")
         assert(m.isMounted)
       }
       assert(!m.isMounted)
@@ -198,7 +198,7 @@ object TestTest extends TestSuite {
       ReactTestUtils.withRenderedIntoBody(IC()) { mm =>
         m = mm
         val n = m.getDOMNode
-        assert(ReactTestUtils.removeReactDataAttr(n.outerHTML) startsWith "<label><input ")
+        assert(ReactTestUtils.removeReactInternals(n.outerHTML) startsWith "<label><input ")
         assert(m.isMounted)
 
         // Benefits of body over detached
@@ -219,7 +219,7 @@ object TestTest extends TestSuite {
         promise.future
       }
       val n = m.getDOMNode
-      assert(ReactTestUtils.removeReactDataAttr(n.outerHTML) startsWith "<label><input ")
+      assert(ReactTestUtils.removeReactInternals(n.outerHTML) startsWith "<label><input ")
       assert(m.isMounted)
 
       promise.success(())
@@ -237,7 +237,7 @@ object TestTest extends TestSuite {
         promise.future
       }
       val n = m.getDOMNode
-      assert(ReactTestUtils.removeReactDataAttr(n.outerHTML) startsWith "<label><input ")
+      assert(ReactTestUtils.removeReactInternals(n.outerHTML) startsWith "<label><input ")
       assert(m.isMounted)
 
       // Benefits of body over detached
@@ -263,5 +263,15 @@ object TestTest extends TestSuite {
         assertRendered(m.getDOMNode, "<div>started → done!</div>")
       }
     }
+
+    'removeReactInternals {
+      val c = ScalaComponent.static("", <.div(<.br, "hello", <.hr))
+      ReactTestUtils.withRenderedIntoDocument(c()) { m =>
+        val orig = m.getDOMNode.outerHTML
+        val after = ReactTestUtils.removeReactInternals(orig)
+        assertEq("<div><br>hello<hr></div>", after)
+        s"$orig  →  $after"
+      }
+    }
   }
 }

test/src/test/scala/japgolly/scalajs/react/test/TestUtil.scala

@@ -108,7 +108,7 @@ trait TestUtil
   }
 
   def assertRendered(n: TopNode, expected: String): Unit = {
-    val rendered: String = ReactTestUtils.removeReactDataAttr(n.outerHTML)
+    val rendered: String = ReactTestUtils.removeReactInternals(n.outerHTML)
     assertEq(rendered, expected)
   }