Resolve issue marko-js#920.

DylanPiercey · Nov 15, 2017 · 68129e6 · 68129e6
1 parent 342a3e7
commit 68129e6
Show file tree

Hide file tree

Showing 15 changed files with 159 additions and 0 deletions.
diff --git a/src/morphdom/index.js b/src/morphdom/index.js
@@ -105,6 +105,10 @@ function morphdom(
             isPrevText = isText;
         }
 
+        if (endNode === startNode) {
+            return insertAfter(createMarkerComment(), startNode, parentNode);
+        }
+
         return endNode;
     }
 

diff --git a/test/autotests/components-pages/empty-component/components/a/index.marko b/test/autotests/components-pages/empty-component/components/a/index.marko
@@ -0,0 +1,7 @@
+class {
+    onMount() {
+        window.app = this;
+    }
+}
+
+<b key="b"/>
diff --git a/test/autotests/components-pages/empty-component/components/b/index.marko b/test/autotests/components-pages/empty-component/components/b/index.marko
@@ -0,0 +1,3 @@
+class {}
+
+-- ${undefined}
diff --git a/test/autotests/components-pages/empty-component/template.marko b/test/autotests/components-pages/empty-component/template.marko
@@ -0,0 +1,23 @@
+lasso-page dependencies=input.browserDependencies lasso=input.lasso
+
+<!DOCTYPE html>
+html lang="en"
+    head
+        meta charset="UTF-8"
+        title -- Marko Test
+        lasso-head
+    body
+
+        div id="test"
+        div id="mocha"
+        div id="testsTarget"
+
+        lasso-body
+
+        <a key="a"/>
+
+        init-components immediate
+
+        lasso-slot name="mocha-run"
+
+        browser-refresh
diff --git a/test/autotests/components-pages/empty-component/tests.js b/test/autotests/components-pages/empty-component/tests.js
@@ -0,0 +1,10 @@
+var path = require('path');
+var expect = require('chai').expect;
+
+describe(path.basename(__dirname), function() {
+    it('should allow diffing html', function() {
+        var app = window.app;
+        app.forceUpdate();
+        app.update();
+    });
+});
diff --git a/test/autotests/components-pages/if-empty-component/components/a/index.marko b/test/autotests/components-pages/if-empty-component/components/a/index.marko
@@ -0,0 +1,12 @@
+class {
+    onMount() {
+        window.app = this;
+    }
+}
+
+<if(input.show)>
+    <div.show/>
+</if>
+<else>
+    <b key="b"/>
+</else>
diff --git a/test/autotests/components-pages/if-empty-component/components/b/index.marko b/test/autotests/components-pages/if-empty-component/components/b/index.marko
@@ -0,0 +1,3 @@
+class {}
+
+-- ${undefined}
diff --git a/test/autotests/components-pages/if-empty-component/template.marko b/test/autotests/components-pages/if-empty-component/template.marko
@@ -0,0 +1,23 @@
+lasso-page dependencies=input.browserDependencies lasso=input.lasso
+
+<!DOCTYPE html>
+html lang="en"
+    head
+        meta charset="UTF-8"
+        title -- Marko Test
+        lasso-head
+    body
+
+        div id="test"
+        div id="mocha"
+        div id="testsTarget"
+
+        lasso-body
+
+        <a key="a"/>
+
+        init-components immediate
+
+        lasso-slot name="mocha-run"
+
+        browser-refresh
diff --git a/test/autotests/components-pages/if-empty-component/tests.js b/test/autotests/components-pages/if-empty-component/tests.js
@@ -0,0 +1,13 @@
+var path = require('path');
+var expect = require('chai').expect;
+
+describe(path.basename(__dirname), function() {
+    it('should allow diffing html', function() {
+        var app = window.app;
+        app.forceUpdate();
+        app.update();
+        app.input = { show: true };
+        app.forceUpdate();
+        app.update();
+    });
+});
diff --git a/test/autotests/components-pages/nesting/components/a/index.marko b/test/autotests/components-pages/nesting/components/a/index.marko
@@ -0,0 +1,7 @@
+class {
+    onMount() {
+        window.app = this;
+    }
+}
+
+<b model={} key="b"/>
diff --git a/test/autotests/components-pages/nesting/components/b/index.marko b/test/autotests/components-pages/nesting/components/b/index.marko
@@ -0,0 +1,5 @@
+class {
+
+}
+
+<c key="c"/>
diff --git a/test/autotests/components-pages/nesting/components/c/index.marko b/test/autotests/components-pages/nesting/components/c/index.marko
@@ -0,0 +1,5 @@
+class {
+}
+
+<d key="d1"/>
+<d key="d2"/>
diff --git a/test/autotests/components-pages/nesting/components/d/index.marko b/test/autotests/components-pages/nesting/components/d/index.marko
@@ -0,0 +1,4 @@
+class {
+}
+
+<div.d/>
diff --git a/test/autotests/components-pages/nesting/template.marko b/test/autotests/components-pages/nesting/template.marko
@@ -0,0 +1,24 @@
+lasso-page dependencies=input.browserDependencies lasso=input.lasso
+
+<!DOCTYPE html>
+html lang="en"
+    head
+        meta charset="UTF-8"
+        title -- Marko Test
+        lasso-head
+    body
+
+        div id="test"
+        div id="mocha"
+        div id="testsTarget"
+
+        lasso-body
+
+        div id="test-result"
+            a key="a"
+
+        init-components immediate
+
+        lasso-slot name="mocha-run"
+
+        browser-refresh
diff --git a/test/autotests/components-pages/nesting/tests.js b/test/autotests/components-pages/nesting/tests.js
@@ -0,0 +1,16 @@
+var path = require('path');
+var expect = require('chai').expect;
+var Component = require('./components/a/index.marko');
+
+describe(path.basename(__dirname), function() {
+    it('should allow diffing html', function() {
+        var parentNode = document.getElementById('test-result');
+        var app = window.app;
+        app.forceUpdate();
+        app.update();
+        expect(app.getEl().parentNode).to.equal(parentNode);
+        expect(parentNode.querySelectorAll('.d').length).to.equal(2);
+        // Ensure it produces the same output as rendering in the browser.
+        expect(Component.renderSync().toString(), parentNode.innerHTML)
+    });
+});