fix: mountToJson not rendering mixed children (#34)

* Fix mountToJson not rendering string text * fixup! Fix mountToJson not rendering string text
adriantoine · Dec 15, 2016 · 4fcfbf3 · 4fcfbf3
1 parent 0575ada
commit 4fcfbf3
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/src/mount.js b/src/mount.js
@@ -10,6 +10,10 @@ function instToJson(inst) {
     if (typeof inst === 'string' || typeof inst === 'number') return inst;
     if (!inst) return '';
 
+    if (inst._stringText) {
+        return inst._stringText;
+    }
+
     if (!inst.getPublicInstance) {
         const internal = internalInstance(inst);
         return instToJson(internal);

diff --git a/tests/core/__snapshots__/mount.test.js.snap b/tests/core/__snapshots__/mount.test.js.snap
@@ -139,6 +139,46 @@ exports[`test converts basic pure mount 1`] = `
 </BasicPure>
 `;
 
+exports[`test converts class mount with mixed children 1`] = `
+<BasicClass>
+  <div
+    className="basic-class undefined"
+    onClick={[Function]}>
+    <div
+      className="group"
+      id="group-id">
+      <span>
+        Hello 
+        world
+        !
+      </span>
+      <span
+        className="empty" />
+    </div>
+  </div>
+</BasicClass>
+`;
+
+exports[`test converts pure mount with mixed children 1`] = `
+<BasicPure>
+  <div
+    className="basic-pure undefined"
+    onClick={[Function]}>
+    <div
+      className="group"
+      id="group-id">
+      <span>
+        Hello 
+        world
+        !
+      </span>
+      <span
+        className="empty" />
+    </div>
+  </div>
+</BasicPure>
+`;
+
 exports[`test skips undefined props 1`] = `
 <BasicWithUndefined>
   <button>

diff --git a/tests/core/mount.test.js b/tests/core/mount.test.js
@@ -14,6 +14,13 @@ it('converts basic pure mount', () => {
     expect(mountToJson(mounted)).toMatchSnapshot();
 });
 
+it('converts pure mount with mixed children', () => {
+    const mounted = mount(
+      <BasicPure>Hello {'world'}!</BasicPure>
+    );
+    expect(mountToJson(mounted)).toMatchSnapshot();
+});
+
 it('converts basic class mount', () => {
     const mounted = mount(
         <BasicClass className="class"><strong>Hello!</strong></BasicClass>
@@ -22,6 +29,13 @@ it('converts basic class mount', () => {
     expect(mountToJson(mounted)).toMatchSnapshot();
 });
 
+it('converts class mount with mixed children', () => {
+    const mounted = mount(
+      <BasicClass>Hello {'world'}!</BasicClass>
+    );
+    expect(mountToJson(mounted)).toMatchSnapshot();
+});
+
 it('converts a class mount with a pure function in it', () => {
     const mounted = mount(
         <ClassWithPure className="class"><strong>Hello!</strong></ClassWithPure>